分销店铺确认信息
This commit is contained in:
@@ -1,7 +1,9 @@
|
|||||||
package com.czg.controller.user;
|
package com.czg.controller.user;
|
||||||
|
|
||||||
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
import com.czg.account.dto.shopuser.ShopUserAddDTO;
|
import com.czg.account.dto.shopuser.ShopUserAddDTO;
|
||||||
import com.czg.account.dto.shopuser.ShopUserDetailDTO;
|
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.dto.shopuser.ShopUserVipCardDTO;
|
||||||
import com.czg.account.entity.ShopInfo;
|
import com.czg.account.entity.ShopInfo;
|
||||||
import com.czg.account.entity.ShopUser;
|
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 CzgResult.success(shopUserService.join(StpKit.USER.getShopId(), StpKit.USER.getLoginIdAsLong(), shopUserAddDTO));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 确认信息
|
||||||
|
* @return 是否成功
|
||||||
|
*/
|
||||||
|
@PostMapping("/confirm")
|
||||||
|
public CzgResult<Boolean> confirm(@RequestBody @Validated ShopUserEditDTO shopUserEditDTO) {
|
||||||
|
ShopUser shopUser = new ShopUser();
|
||||||
|
BeanUtil.copyProperties(shopUserEditDTO, shopUser);
|
||||||
|
shopUserService.getService().updateInfo(shopUser);
|
||||||
|
return CzgResult.success();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取余额余额明细
|
* 获取余额余额明细
|
||||||
|
|||||||
@@ -33,5 +33,7 @@ public class ShopUserEditDTO {
|
|||||||
*/
|
*/
|
||||||
@Size(min = 1, message = "手机号不为空")
|
@Size(min = 1, message = "手机号不为空")
|
||||||
private String phone;
|
private String phone;
|
||||||
|
//分销店铺确认
|
||||||
|
private String shopConfirm;
|
||||||
private Integer status;
|
private Integer status;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -151,6 +151,8 @@ public class ShopUser implements Serializable {
|
|||||||
private LocalDateTime nextDeliverTime;
|
private LocalDateTime nextDeliverTime;
|
||||||
// 是否分销员
|
// 是否分销员
|
||||||
private String distributionShops;
|
private String distributionShops;
|
||||||
|
//分销店铺确认
|
||||||
|
private String shopConfirm;
|
||||||
|
|
||||||
private String memberCircleName;
|
private String memberCircleName;
|
||||||
private Integer memberCircleReward;
|
private Integer memberCircleReward;
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
package com.czg.account.service;
|
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.account.entity.ShopUser;
|
||||||
import com.czg.resp.CzgResult;
|
import com.czg.resp.CzgResult;
|
||||||
import com.mybatisflex.core.paginate.Page;
|
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 {
|
public interface UShopUserService {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取服务层。
|
||||||
|
*/
|
||||||
|
ShopUserService getService();
|
||||||
|
|
||||||
ShopUser getShopUserInfo(Long shopId, long userId);
|
ShopUser getShopUserInfo(Long shopId, long userId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ import com.czg.market.entity.MkPointsUser;
|
|||||||
import com.czg.market.entity.MkShopCouponRecord;
|
import com.czg.market.entity.MkShopCouponRecord;
|
||||||
import com.czg.market.service.MkPointsUserService;
|
import com.czg.market.service.MkPointsUserService;
|
||||||
import com.czg.market.service.MkShopCouponRecordService;
|
import com.czg.market.service.MkShopCouponRecordService;
|
||||||
import com.czg.market.service.TbMemberConfigService;
|
|
||||||
import com.czg.resp.CzgResult;
|
import com.czg.resp.CzgResult;
|
||||||
import com.czg.service.RedisService;
|
import com.czg.service.RedisService;
|
||||||
import com.czg.service.account.mapper.ShopConfigMapper;
|
import com.czg.service.account.mapper.ShopConfigMapper;
|
||||||
@@ -57,6 +56,11 @@ public class UShopUserServiceImpl implements UShopUserService {
|
|||||||
@DubboReference
|
@DubboReference
|
||||||
private MkPointsUserService pointsUserService;
|
private MkPointsUserService pointsUserService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ShopUserService getService() {
|
||||||
|
return shopUserService;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ShopUser getShopUserInfo(Long shopId, long userId) {
|
public ShopUser getShopUserInfo(Long shopId, long userId) {
|
||||||
return shopUserService.getShopUserInfo(shopId, userId);
|
return shopUserService.getShopUserInfo(shopId, userId);
|
||||||
|
|||||||
Reference in New Issue
Block a user