From 155e99a58870d82e123af50ede8e8e4f10790f58 Mon Sep 17 00:00:00 2001 From: zt Date: Wed, 2 Jul 2025 15:24:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/StoreGoodsTypeRespVO.java | 12 ++++--- .../vo/StoreGoodsTypeSaveReqVO.java | 7 +++-- .../admin/user/MemberUserController.java | 31 ++++++------------- .../controller/admin/user/vo/GeneralVO.java | 8 +++++ .../activity/AppActivityDrawController.java | 2 +- .../storegoodstype/StoreGoodsTypeDO.java | 14 ++++++--- .../dal/mysql/user/MemberUserMapper.java | 3 +- .../StoreGoodsTypeServiceImpl.java | 26 ++++++++-------- .../service/user/MemberUserService.java | 2 ++ .../service/user/MemberUserServiceImpl.java | 6 ++++ .../app/divide/AppDivideController.java | 3 +- 11 files changed, 63 insertions(+), 51 deletions(-) create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/GeneralVO.java diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storegoodstype/vo/StoreGoodsTypeRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storegoodstype/vo/StoreGoodsTypeRespVO.java index b7598f3e..ed67c10f 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storegoodstype/vo/StoreGoodsTypeRespVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storegoodstype/vo/StoreGoodsTypeRespVO.java @@ -1,12 +1,11 @@ package cn.iocoder.yudao.module.member.controller.admin.storegoodstype.vo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; +import lombok.Data; + import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; @Schema(description = "管理后台 - 商品类别 Response VO") @Data @@ -25,4 +24,7 @@ public class StoreGoodsTypeRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + @Schema(description = "是否在APP展示") + private String appShow; + } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storegoodstype/vo/StoreGoodsTypeSaveReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storegoodstype/vo/StoreGoodsTypeSaveReqVO.java index 2d55f894..45f125a8 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storegoodstype/vo/StoreGoodsTypeSaveReqVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storegoodstype/vo/StoreGoodsTypeSaveReqVO.java @@ -1,9 +1,7 @@ package cn.iocoder.yudao.module.member.controller.admin.storegoodstype.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; +import lombok.Data; @Schema(description = "管理后台 - 商品类别新增/修改 Request VO") @Data @@ -15,4 +13,7 @@ public class StoreGoodsTypeSaveReqVO { @Schema(description = "类别名称", example = "芋艿") private String categoryName; + @Schema(description = "是否在APP展示") + private String appShow; + } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java index eee2578f..c513c7da 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java @@ -8,13 +8,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserAddVO; -import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserExportVo; -import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO; -import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO; -import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateLevelReqVO; -import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdatePointReqVO; -import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; +import cn.iocoder.yudao.module.member.controller.admin.user.vo.*; import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert; import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO; import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; @@ -32,26 +26,14 @@ import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; import java.time.LocalDateTime; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @@ -221,7 +203,12 @@ public class MemberUserController { return success(true); } - + @PutMapping("/general") + @Operation(summary = "人脸通用设置") + public CommonResult general(@RequestBody GeneralVO generalVO){ + memberUserService.general(generalVO.getMobile()); + return success(true); + } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/GeneralVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/GeneralVO.java new file mode 100644 index 00000000..1212de2c --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/GeneralVO.java @@ -0,0 +1,8 @@ +package cn.iocoder.yudao.module.member.controller.admin.user.vo; + +import lombok.Data; + +@Data +public class GeneralVO { + private String mobile; +} diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/activity/AppActivityDrawController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/activity/AppActivityDrawController.java index b896f5b4..7bdc9ad3 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/activity/AppActivityDrawController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/activity/AppActivityDrawController.java @@ -68,7 +68,7 @@ import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*; @Tag(name = "用户 APP - 活动") @RestController -@RequestMapping("/member/activity") +@RequestMapping("/member/activity1") @Validated public class AppActivityDrawController { diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storegoodstype/StoreGoodsTypeDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storegoodstype/StoreGoodsTypeDO.java index 10c4b6c9..3860a50e 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storegoodstype/StoreGoodsTypeDO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storegoodstype/StoreGoodsTypeDO.java @@ -1,11 +1,10 @@ package cn.iocoder.yudao.module.member.dal.dataobject.storegoodstype; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; /** * 商品类别 DO @@ -32,4 +31,9 @@ public class StoreGoodsTypeDO extends BaseDO { */ private String categoryName; + /** + * 是否在APP展示 + */ + private String appShow; + } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java index a882e1fd..1bcea4cf 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java @@ -124,5 +124,6 @@ public interface MemberUserMapper extends BaseMapperX { @Select("select * from member_user where id = #{userId} for update") MemberUserDO selectByIdForUpdate(@Param("userId") Long userId); - + @Update("update user_face set carteen_id = null where phone = #{phone}") + void updateFaceCanteenId( @Param("phone") String phone); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storegoodstype/StoreGoodsTypeServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storegoodstype/StoreGoodsTypeServiceImpl.java index 864b0fe6..940d490a 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storegoodstype/StoreGoodsTypeServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storegoodstype/StoreGoodsTypeServiceImpl.java @@ -1,23 +1,22 @@ package cn.iocoder.yudao.module.member.service.storegoodstype; import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.member.controller.admin.storegoodstype.vo.*; -import cn.iocoder.yudao.module.member.dal.dataobject.storegoodstype.StoreGoodsTypeDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; - +import cn.iocoder.yudao.module.member.controller.admin.storegoodstype.vo.StoreGoodsTypePageReqVO; +import cn.iocoder.yudao.module.member.controller.admin.storegoodstype.vo.StoreGoodsTypeSaveReqVO; +import cn.iocoder.yudao.module.member.dal.dataobject.storegoodstype.StoreGoodsTypeDO; import cn.iocoder.yudao.module.member.dal.mysql.storegoodstype.StoreGoodsTypeMapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; +import java.util.List; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.STORE_GOODS_TYPE_NOT_EXISTS; /** * 商品类别 Service 实现类 @@ -75,7 +74,8 @@ public class StoreGoodsTypeServiceImpl implements StoreGoodsTypeService { @Override public List getAll() { - return storeGoodsTypeMapper.selectList(); + return storeGoodsTypeMapper.selectList(Wrappers.lambdaQuery() + .eq(StoreGoodsTypeDO::getAppShow, "1")); } @Override diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java index 52c4825f..74a24999 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java @@ -273,4 +273,6 @@ public interface MemberUserService { void jsonCreate(String filePath,Long storeId); void imgCreate(String filePath,Long storeId); + + void general(String mobile); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java index f278b19d..c57ec936 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java @@ -1299,4 +1299,10 @@ public class MemberUserServiceImpl implements MemberUserService { ); return dishOrderDOS.size(); } + + + @Override + public void general(String mobile) { + memberUserMapper.updateFaceCanteenId(mobile); + } } diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/divide/AppDivideController.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/divide/AppDivideController.java index f33baa91..988210ca 100644 --- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/divide/AppDivideController.java +++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/divide/AppDivideController.java @@ -34,7 +34,8 @@ public class AppDivideController { @PostMapping("/activityRefundMoney") @Operation(summary = "活动退款") public CommonResult activityRefundMoney(@RequestBody ActivityRefundMoney refundMoney) { - return success(profitsharingService.activityRefundMoney(refundMoney)); + profitsharingService.activityRefundMoney(refundMoney); + return success(true); } } \ No newline at end of file