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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
wangw
2025-11-14 10:07:50 +08:00
parent a4d84dfd87 625a47ba93
commit 595ef332ac
5 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java
View File

@@ -152,6 +152,8 @@ public class ShopUser implements Serializable {
private LocalDateTime nextDeliverTime;
// 是否分销员
private String distributionShops;
private String memberCircleName;
private Integer memberCircleReward;
@Column(ignore = true)
private String memberName;

2
cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberDetailVO.java
View File

@@ -34,4 +34,6 @@ public class MemberDetailVO implements Serializable {
private LocalDateTime endTime;
private String memberName;
private String memberCircleName;
private Integer memberCircleReward;
}

11
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java
View File

@@ -99,6 +99,7 @@ public class AShopUserServiceImpl implements AShopUserService {
PageInfo<ShopUserDTO> shopUserDTOPageInfo = new PageInfo<>(shopUserMapper.selectPageByKeyAndIsVip(mainIdByShopId, isVip, key, amount));
shopUserDTOPageInfo.getList().forEach(item -> {
item.setNew(consumeDiscountService.isNewUser(item, StpKit.USER.getShopId()));
setUserDiscount(item);
});
return PageUtil.convert(shopUserDTOPageInfo);
}
@@ -182,6 +183,16 @@ public class AShopUserServiceImpl implements AShopUserService {
return shopUserService.save(shopUser);
}
private void setUserDiscount(ShopUserDTO shopUserDTO) {
if (shopUserDTO.getMemberLevelId() != null) {
MemberLevelConfig memberLevelConfig = memberLevelConfigService.getById(shopUserDTO.getMemberLevelId());
shopUserDTO.setMemberLevelName(memberLevelConfig == null ? null : memberLevelConfig.getName());
if (memberLevelConfig != null) {
shopUserDTO.setDiscount(memberLevelConfig.getDiscount());
}
}
}
@Override
public ShopUser getDetail(Integer id, Integer userId) {
Long mainId = shopInfoService.getMainIdByShopId(StpKit.USER.getShopId());

17
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
View File

@@ -331,7 +331,9 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
if (levelVO.getIsCostRewardPoints() == 1 && levelVO.getCostRewardPoints() != null) {
int points = (int) (money.floatValue() / levelVO.getCostRewardPoints());
log.info("消费送积分: {}", points);
memberPointsService.addPoints(shopUser.getId(), points, "会员消费送积分", null);
if (points > 0) {
memberPointsService.addPoints(shopUser.getId(), points, "会员消费送积分", null);
}
}
}
case RECHARGE -> {
@@ -441,7 +443,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
}
@Override
@Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
@Transactional(rollbackFor = Exception.class)
public boolean joinMember(Long shopId, Long userId, Long memberOrderId) {
MemberConfigVO memberConfigVO = detail(shopId);
ShopUser shopUser = shopUserService.getShopUserInfo(shopId, userId);
@@ -515,14 +517,17 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
memberOrder.setPayAmount(memberOrder.getAmount());
memberOrder.setStatus(OrderStatusEnums.DONE.getCode());
memberOrderService.updateById(memberOrder);
if (memberOrder.getReward() != null) {
deliver(shopUser, TableValueConstant.MemberExpFlow.Type.PAY, memberOrder.getAmount(), memberOrder.getReward(), memberOrderId);
}
if (shopUser.getMemberLevelId() == null || shopUser.getMemberLevelId() == 0) {
shopUser.setMemberLevelId(levelConfig.getId());
}
shopUser.setMemberCircleName(memberOrder.getName());
shopUser.setMemberCircleReward(memberOrder.getReward());
shopUser.setIsVip(1);
shopUser.setOpenType("PAY");
if (memberOrder.getReward() != null) {
deliver(shopUser, TableValueConstant.MemberExpFlow.Type.PAY, memberOrder.getAmount(), memberOrder.getReward(), memberOrderId);
}
return shopUserService.updateInfo(shopUser);
}
@@ -568,6 +573,8 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
MemberLevelConfig nextLevel = levelConfigService.getOne(new QueryWrapper().eq(MemberLevelConfig::getShopId, shopId).ge(MemberLevelConfig::getExperienceValue, shopUser.getExperience())
.ne(MemberLevelConfig::getId, shopUser.getMemberLevelId()).orderBy(MemberLevelConfig::getExperienceValue, true));
return new MemberDetailVO()
.setMemberCircleName(shopUser.getMemberCircleName())
.setMemberCircleReward(shopUser.getMemberCircleReward())
.setMemberName(shopUser.getMemberName())
.setShopInfo(shopInfo)
.setMemberLevel(levelVO)

4
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
View File

@@ -1130,10 +1130,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
.setBizEnum(ShopUserFlowBizEnum.ORDER_PAY)
.setRelationId(orderInfo.getId())
.setMoney(orderInfo.getOrderAmount());
shopUserService.updateMoney(shopUserMoneyEditDTO);
redisService.del(RedisCst.classKeyExpired.EXPIRED_ORDER + orderInfo.getId());
// 发放成长值
// 会员消费赠送成长值
shopUser = shopUserService.getById(shopUser);
memberConfigService.deliver(shopUser,
TableValueConstant.MemberExpFlow.Type.RECHARGE,
BigDecimal.valueOf(czgCallBackDto.getAmount()).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN), null, orderInfo.getId());