diff --git a/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java b/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java index 4ab8859ae..ff17bfda6 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java @@ -1,7 +1,9 @@ package com.czg.controller.user; +import cn.hutool.core.bean.BeanUtil; import com.czg.account.dto.shopuser.ShopUserAddDTO; import com.czg.account.dto.shopuser.ShopUserDetailDTO; +import com.czg.account.dto.shopuser.ShopUserEditDTO; import com.czg.account.dto.shopuser.ShopUserVipCardDTO; import com.czg.account.entity.ShopInfo; import com.czg.account.entity.ShopUser; @@ -75,6 +77,19 @@ public class UShopUserController { return CzgResult.success(shopUserService.join(StpKit.USER.getShopId(), StpKit.USER.getLoginIdAsLong(), shopUserAddDTO)); } + /** + * 确认信息 + * @return 是否成功 + */ + @PostMapping("/confirm") + public CzgResult confirm(@RequestBody @Validated ShopUserEditDTO shopUserEditDTO) { + ShopUser shopUser = new ShopUser(); + BeanUtil.copyProperties(shopUserEditDTO, shopUser); + shopUserService.getService().updateInfo(shopUser); + return CzgResult.success(); + } + + /** * 获取余额余额明细 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserEditDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserEditDTO.java index f73c0787e..9c2f98af3 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserEditDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserEditDTO.java @@ -33,5 +33,7 @@ public class ShopUserEditDTO { */ @Size(min = 1, message = "手机号不为空") private String phone; + //分销店铺确认 + private String shopConfirm; private Integer status; } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java index 9ee30362d..20efe27e4 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java @@ -151,6 +151,8 @@ public class ShopUser implements Serializable { private LocalDateTime nextDeliverTime; // 是否分销员 private String distributionShops; + //分销店铺确认 + private String shopConfirm; private String memberCircleName; private Integer memberCircleReward; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/UShopUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/UShopUserService.java index 276d9647d..6717c9e86 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/UShopUserService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/UShopUserService.java @@ -1,12 +1,12 @@ package com.czg.account.service; -import com.czg.account.dto.shopuser.*; +import com.czg.account.dto.shopuser.ShopUserAddDTO; +import com.czg.account.dto.shopuser.ShopUserDetailDTO; +import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO; +import com.czg.account.dto.shopuser.ShopUserVipCardDTO; import com.czg.account.entity.ShopUser; import com.czg.resp.CzgResult; import com.mybatisflex.core.paginate.Page; -import com.mybatisflex.core.service.IService; - -import java.math.BigDecimal; /** * 商户储值会员 服务层。 @@ -16,6 +16,11 @@ import java.math.BigDecimal; */ public interface UShopUserService { + /** + * 获取服务层。 + */ + ShopUserService getService(); + ShopUser getShopUserInfo(Long shopId, long userId); /** diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java index b5ba1797a..090c86669 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java @@ -14,7 +14,6 @@ import com.czg.market.entity.MkPointsUser; import com.czg.market.entity.MkShopCouponRecord; import com.czg.market.service.MkPointsUserService; import com.czg.market.service.MkShopCouponRecordService; -import com.czg.market.service.TbMemberConfigService; import com.czg.resp.CzgResult; import com.czg.service.RedisService; import com.czg.service.account.mapper.ShopConfigMapper; @@ -57,6 +56,11 @@ public class UShopUserServiceImpl implements UShopUserService { @DubboReference private MkPointsUserService pointsUserService; + @Override + public ShopUserService getService() { + return shopUserService; + } + @Override public ShopUser getShopUserInfo(Long shopId, long userId) { return shopUserService.getShopUserInfo(shopId, userId);