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

Merge branch 'prod' into test

Browse Source
This commit is contained in:
张松
2025-11-13 11:10:10 +08:00
parent aa7dcb8199 cd168311f0
commit 3343875cff
13 changed files with 64 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,6 +135,7 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
userInfo.setAmount(BigDecimal.ZERO);
}
userFlow.setUserId(userInfo.getUserId());
userFlow.setShopUserId(shopUserEditDTO.getId());
userFlow.setShopId(userInfo.getSourceShopId());
userFlow.setAmount(shopUserEditDTO.getType() == 0 ? shopUserEditDTO.getMoney().negate() : shopUserEditDTO.getMoney());
userFlow.setBalance(shopUserEditDTO.getType() == 0 ? userInfo.getAmount().subtract(shopUserEditDTO.getMoney()) : userInfo.getAmount().add(shopUserEditDTO.getMoney()));

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

@@ -179,6 +179,9 @@ public class UShopUserServiceImpl implements UShopUserService {
if (StrUtil.isBlank(shopUser.getCode())) {
shopUser.setCode(generateCode(shopId));
}
if (StrUtil.isBlank(shopUser.getBirthDay())) {
shopUser.setBirthDay(null);
}
shopUser.setJoinTime(shopUser.getJoinTime() == null ? DateUtil.date().toLocalDateTime() : shopUser.getJoinTime());
@@ -229,6 +232,7 @@ public class UShopUserServiceImpl implements UShopUserService {
shopUserDetailDTO.setFreeDineConfig(freeDineConfigService.getConfig(shopInfoService.getMainIdByShopId(shopId)));
shopUserDetailDTO.setPayPwd(userInfo.getPayPwd());
shopUserDetailDTO.setUsePayPwd(userInfo.getUsePayPwd());
return shopUserDetailDTO;
}