czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

切换店铺统计 √

Browse Source 
下单选择会员 √
注册会员 √
完善手机号 √
会员流水信息同步 √
This commit is contained in:
Tankaikai
2025-04-10 18:21:08 +08:00
parent c3b47e05c8
commit b25c402e41
8 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java
View File

@@ -104,11 +104,11 @@ public class ShopInfoController {
Long headId = StpKit.USER.getHeadId(); Long headId = StpKit.USER.getHeadId();
List<TokenSign> tokenSignList = StpKit.USER.getSession().getTokenSignList(); List<TokenSign> tokenSignList = StpKit.USER.getSession().getTokenSignList();
if (headId != null && CollUtil.isEmpty(tokenSignList)) { if (headId != null && CollUtil.isEmpty(tokenSignList)) {
shopId = headId; shopId = StpKit.USER.getHeadShopId();
} else { } else {
long count = tokenSignList.stream().filter(obj -> tokenValue.equals(obj.getValue())).count(); long count = tokenSignList.stream().filter(obj -> tokenValue.equals(obj.getValue())).count();
if (headId != null && count == 0) { if (headId != null && count == 0) {
shopId = headId; shopId = StpKit.USER.getHeadShopId();
} }
} }
List<ShopBranchSelectDTO> data = shopInfoService.findShopBranch(shopId); List<ShopBranchSelectDTO> data = shopInfoService.findShopBranch(shopId);

12
cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java
View File

@@ -43,7 +43,7 @@ public class ShopUserController {
@GetMapping("/summary") @GetMapping("/summary")
@SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi") @SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi")
public CzgResult<ShopUserSummaryDTO> summary(Integer isVip) { public CzgResult<ShopUserSummaryDTO> summary(Integer isVip) {
return CzgResult.success(shopUserService.getSummary(StpKit.USER.getHeadShopId(), isVip)); return CzgResult.success(shopUserService.getSummary(StpKit.USER.getVipHeadShopId(), isVip));
} }
/** /**
@@ -67,7 +67,7 @@ public class ShopUserController {
@GetMapping("/flow") @GetMapping("/flow")
@SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi") @SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi")
public CzgResult<Page<ShopUserFlowVO>> flow(Integer userId, String bizCode, String startTime, String endTime) { public CzgResult<Page<ShopUserFlowVO>> flow(Integer userId, String bizCode, String startTime, String endTime) {
return CzgResult.success(shopUserFlowService.pageInfo(StpKit.USER.getHeadShopId(), userId, bizCode, startTime, endTime)); return CzgResult.success(shopUserFlowService.pageInfo(StpKit.USER.getVipHeadShopId(), userId, bizCode, startTime, endTime));
} }
/** /**
@@ -83,7 +83,7 @@ public class ShopUserController {
@GetMapping("/flow/download") @GetMapping("/flow/download")
@SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi") @SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi")
public void flowDownload(Integer userId, String bizCode, String startTime, String endTime, HttpServletResponse response) throws IOException { public void flowDownload(Integer userId, String bizCode, String startTime, String endTime, HttpServletResponse response) throws IOException {
shopUserFlowService.flowDownload(StpKit.USER.getHeadShopId(), userId, bizCode, startTime, endTime, response); shopUserFlowService.flowDownload(StpKit.USER.getVipHeadShopId(), userId, bizCode, startTime, endTime, response);
} }
/** /**
@@ -125,7 +125,7 @@ public class ShopUserController {
@SaAdminCheckPermission(value = "shopUser:add", name = "店铺用户添加") @SaAdminCheckPermission(value = "shopUser:add", name = "店铺用户添加")
@PostMapping @PostMapping
public CzgResult<Boolean> add(@RequestBody @Validated ShopUserAddDTO shopUserAddDTO) { public CzgResult<Boolean> add(@RequestBody @Validated ShopUserAddDTO shopUserAddDTO) {
return CzgResult.success(shopUserService.add(StpKit.USER.getHeadShopId(), shopUserAddDTO)); return CzgResult.success(shopUserService.add(StpKit.USER.getVipHeadShopId(), shopUserAddDTO));
} }
/** /**
@@ -137,7 +137,7 @@ public class ShopUserController {
@SaAdminCheckPermission(value = "shopUser:edit", name = "店铺用户修改") @SaAdminCheckPermission(value = "shopUser:edit", name = "店铺用户修改")
@PutMapping @PutMapping
public CzgResult<Boolean> edit(@RequestBody @Validated ShopUserEditDTO shopUserEditDTO) { public CzgResult<Boolean> edit(@RequestBody @Validated ShopUserEditDTO shopUserEditDTO) {
return CzgResult.success(shopUserService.updateInfo(StpKit.USER.getHeadShopId(), shopUserEditDTO)); return CzgResult.success(shopUserService.updateInfo(StpKit.USER.getVipHeadShopId(), shopUserEditDTO));
} }
/** /**
@@ -150,7 +150,7 @@ public class ShopUserController {
@PutMapping("/money") @PutMapping("/money")
public CzgResult<Boolean> editMoney(@RequestBody @Validated ShopUserMoneyEditDTO shopUserMoneyEditDTO) { public CzgResult<Boolean> editMoney(@RequestBody @Validated ShopUserMoneyEditDTO shopUserMoneyEditDTO) {
shopUserMoneyEditDTO.setBizEnum(ShopUserFlowBizEnum.ADMIN_IN); shopUserMoneyEditDTO.setBizEnum(ShopUserFlowBizEnum.ADMIN_IN);
return CzgResult.success(shopUserService.updateMoney(StpKit.USER.getHeadShopId(), shopUserMoneyEditDTO) > 0L); return CzgResult.success(shopUserService.updateMoney(StpKit.USER.getVipHeadShopId(), shopUserMoneyEditDTO) > 0L);
} }
} }

6
cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java
View File

@@ -45,7 +45,7 @@ public class UShopUserController {
*/ */
@GetMapping @GetMapping
public CzgResult<ShopUserDetailDTO> get(Long shopId) { public CzgResult<ShopUserDetailDTO> get(Long shopId) {
return CzgResult.success(shopUserService.getInfo(shopId == null ? StpKit.USER.getHeadShopId() : shopId, StpKit.USER.getLoginIdAsLong())); return CzgResult.success(shopUserService.getInfo(shopId == null ? StpKit.USER.getVipHeadShopId() : shopId, StpKit.USER.getLoginIdAsLong()));
} }
/** /**
@@ -65,7 +65,7 @@ public class UShopUserController {
*/ */
@GetMapping("/code") @GetMapping("/code")
public CzgResult<String> code(Long shopId) { public CzgResult<String> code(Long shopId) {
return shopUserService.getCode(StpKit.USER.getLoginIdAsLong(), shopId == null ? StpKit.USER.getHeadShopId() : shopId); return shopUserService.getCode(StpKit.USER.getLoginIdAsLong(), shopId == null ? StpKit.USER.getVipHeadShopId() : shopId);
} }
/** /**
@@ -76,7 +76,7 @@ public class UShopUserController {
@PostMapping @PostMapping
@Debounce("#shopUserAddDTO.phone") @Debounce("#shopUserAddDTO.phone")
public CzgResult<Boolean> join(@RequestBody @Validated ShopUserAddDTO shopUserAddDTO) { public CzgResult<Boolean> join(@RequestBody @Validated ShopUserAddDTO shopUserAddDTO) {
return CzgResult.success(shopUserService.join(StpKit.USER.getHeadShopId(), StpKit.USER.getLoginIdAsLong(), shopUserAddDTO)); return CzgResult.success(shopUserService.join(StpKit.USER.getVipHeadShopId(), StpKit.USER.getLoginIdAsLong(), shopUserAddDTO));
} }

2
cash-api/account-server/src/main/java/com/czg/controller/user/UserController.java
View File

@@ -34,7 +34,7 @@ public class UserController {
*/ */
@PutMapping @PutMapping
public CzgResult<Boolean> update(@RequestBody UserInfoEditDTO userInfoEditDTO) { public CzgResult<Boolean> update(@RequestBody UserInfoEditDTO userInfoEditDTO) {
return CzgResult.success(userInfoService.updateInfo(StpKit.USER.getHeadShopId(), StpKit.USER.getLoginIdAsLong(), userInfoEditDTO)); return CzgResult.success(userInfoService.updateInfo(StpKit.USER.getVipHeadShopId(), StpKit.USER.getLoginIdAsLong(), userInfoEditDTO));
} }
/** /**

2
cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
View File

@@ -303,7 +303,7 @@ public class ProductController {
public CzgResult<Void> sync() { public CzgResult<Void> sync() {
long shopId = StpKit.USER.getShopId(0L); long shopId = StpKit.USER.getShopId(0L);
long sysUserId = StpKit.USER.getLoginIdAsLong(); long sysUserId = StpKit.USER.getLoginIdAsLong();
long headShopId = StpKit.USER.getHeadShopId(); long headShopId = StpKit.USER.getVipHeadShopId();
if(shopId == headShopId){ if(shopId == headShopId){
throw new CzgException("不存在主店分店关系，无需同步"); throw new CzgException("不存在主店分店关系，无需同步");
} }

10
cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java
View File

@@ -61,15 +61,17 @@ public class SaTokenConfigure implements WebMvcConfigurer {
SaRouter.match("/user/**").notMatch("/user/login", "/user/test", "/user/geo/**", "/user/home/**", "/user/home/**", "/user/dict/**", "/user/openId") SaRouter.match("/user/**").notMatch("/user/login", "/user/test", "/user/geo/**", "/user/home/**", "/user/home/**", "/user/dict/**", "/user/openId")
.notMatch("/pay/**") .notMatch("/pay/**")
.notMatch("/notify/**") .notMatch("/order/notify/**")
.notMatch("/user/product/**")
.check(r -> MyStpLogic.CLIENT_LOGIC.checkLogin()) .check(r -> MyStpLogic.CLIENT_LOGIC.checkLogin())
.setHit(true) .setHit(true)
// .match("/**") // .match("/**")
.notMatch("/user/**") .notMatch("/user/**")
.notMatch("/pay/**") .notMatch("/pay/**")
.notMatch("/notify/**") .notMatch("/order/notify/**")
.notMatch("/admin/auth/**") .notMatch("/account/admin/auth/**")
.notMatch("/admin/shopMsgPush/subscribe/**") .notMatch("/user/product/**")
.notMatch("/account/admin/shopMsgPush/subscribe/**")
.check(r -> MyStpLogic.ADMIN_LOGIC.checkLogin()); .check(r -> MyStpLogic.ADMIN_LOGIC.checkLogin());
})).addPathPatterns("/**"); })).addPathPatterns("/**");

16
cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java
View File

@@ -202,13 +202,27 @@ public class MyStpLogic {
return shopId == null ? defaultVal : shopId; return shopId == null ? defaultVal : shopId;
} }
/**
* 获取店铺会员查询主店id
*
* @return 主店id
*/
public Long getVipHeadShopId() {
Long shopId = getShopId(0L);
Long mainId = DbChain.table("tb_shop_config").select("main_id").where("id = ? and is_enable_vip_sync = ?", shopId, 1).objAs(Long.class);
if (mainId != null) {
return mainId;
}
return shopId;
}
/** /**
* 获取主店id * 获取主店id
* @return 主店id * @return 主店id
*/ */
public Long getHeadShopId() { public Long getHeadShopId() {
Long shopId = getShopId(0L); Long shopId = getShopId(0L);
Long mainId = DbChain.table("tb_shop_config").select("main_id").where("id = ? and is_enable_vip_sync = ?", shopId, 1).objAs(Long.class); Long mainId = DbChain.table("tb_shop_config").select("main_id").where("id = ?", shopId).objAs(Long.class);
if (mainId != null) { if (mainId != null) {
return mainId; return mainId;
} }

4
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
View File

@@ -84,7 +84,7 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
@Override @Override
public Page<ShopUserDTO> getPage(String key, Integer isVip, BigDecimal amount) { public Page<ShopUserDTO> getPage(String key, Integer isVip, BigDecimal amount) {
PageHelper.startPage(PageUtil.buildPageHelp()); PageHelper.startPage(PageUtil.buildPageHelp());
return PageUtil.convert(new PageInfo<>(mapper.selectPageByKeyAndIsVip(StpKit.USER.getHeadShopId(), isVip, key, amount))); return PageUtil.convert(new PageInfo<>(mapper.selectPageByKeyAndIsVip(StpKit.USER.getVipHeadShopId(), isVip, key, amount)));
} }
@Override @Override
@@ -352,7 +352,7 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
@Override @Override
public ShopUser getDetail(Integer id, Integer userId) { public ShopUser getDetail(Integer id, Integer userId) {
ShopUser shopUser = getOne(new QueryWrapper().eq(ShopUser::getShopId, StpKit.USER.getHeadShopId()).eq(ShopUser::getId, id).eq(ShopUser::getUserId, userId)); ShopUser shopUser = getOne(new QueryWrapper().eq(ShopUser::getShopId, StpKit.USER.getVipHeadShopId()).eq(ShopUser::getId, id).eq(ShopUser::getUserId, userId));
long count = shopActivateCouponRecordService.count(new QueryWrapper().eq(ShopActivateCouponRecord::getShopUserId, shopUser.getId()).eq(ShopActivateCouponRecord::getStatus, 0)); long count = shopActivateCouponRecordService.count(new QueryWrapper().eq(ShopActivateCouponRecord::getShopUserId, shopUser.getId()).eq(ShopActivateCouponRecord::getStatus, 0));
ShopUserDTO shopUserDTO = BeanUtil.copyProperties(shopUser, ShopUserDTO.class); ShopUserDTO shopUserDTO = BeanUtil.copyProperties(shopUser, ShopUserDTO.class);
shopUserDTO.setCouponNum(count); shopUserDTO.setCouponNum(count);