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

充值修改

Browse Source
This commit is contained in:
张松
2025-09-27 14:38:29 +08:00
parent 3c9e8b93a7
commit ac8d11bea7
2 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java
View File

@@ -153,13 +153,7 @@ public class UShopUserServiceImpl implements UShopUserService {
Long mainId = shopInfoService.getMainIdByShopId(shopId); Long mainId = shopInfoService.getMainIdByShopId(shopId);
// 当前用户信息 // 当前用户信息
UserInfo userInfo = userInfoService.getById(userId); UserInfo userInfo = userInfoService.getById(userId);
ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getSourceShopId, shopId).eq(ShopUser::getUserId, userInfo.getId())); ShopUser shopUser = shopUserService.getShopUserInfo(shopId, userId);
if (shopUser == null) {
shopUser = new ShopUser();
shopUser.setUserId(userId);
shopUser.setSourceShopId(shopId);
shopUser.setMainShopId(mainId);
}
// 查询系统添加的会员 // 查询系统添加的会员
UserInfo oriInfo = userInfoService.getOne(new QueryWrapper().eq(UserInfo::getPhone, shopUserAddDTO.getPhone())); UserInfo oriInfo = userInfoService.getOne(new QueryWrapper().eq(UserInfo::getPhone, shopUserAddDTO.getPhone()));

23
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java
View File

@@ -75,19 +75,16 @@ public class MemberOrderServiceImpl extends ServiceImpl<MemberOrderMapper, Membe
userInfo.setBirthDay(orderDTO.getBirthDay()); userInfo.setBirthDay(orderDTO.getBirthDay());
} }
ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getUserId, orderDTO.getUserId()).eq(ShopUser::getSourceShopId, orderDTO.getShopId())); uShopUserService.join(orderDTO.getShopId(), orderDTO.getUserId(), new ShopUserAddDTO()
if (shopUser == null) { .setPhone(userInfo.getPhone())
uShopUserService.join(orderDTO.getShopId(), orderDTO.getUserId(), new ShopUserAddDTO() .setSex(userInfo.getSex())
.setPhone(userInfo.getPhone()) .setHeadImg(userInfo.getHeadImg())
.setSex(userInfo.getSex()) .setAmount(BigDecimal.ZERO)
.setHeadImg(userInfo.getHeadImg()) .setBirthDay(userInfo.getBirthDay())
.setAmount(BigDecimal.ZERO) .setIsVip(0)
.setBirthDay(userInfo.getBirthDay()) .setAccountPoints(0)
.setIsVip(0) .setNickName(userInfo.getNickName())
.setAccountPoints(0) );
.setNickName(userInfo.getNickName())
);
}
if ("PAY".equals(memberConfigVO.getOpenType())){ if ("PAY".equals(memberConfigVO.getOpenType())){