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-11-13 09:43:49 +08:00
parent 05aa462d20
commit d47aba8add
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cash-api/market-server/src/main/java/com/czg/task/MemberTask.java
View File

@@ -44,6 +44,7 @@ public class MemberTask {
}); });
} }
@Scheduled(cron = "0 */10 * * * *")
public void check() { public void check() {
List<ShopUser> shopUsers = shopUserService.list(new QueryWrapper().isNotNull(ShopUser::getEndTime).eq(ShopUser::getIsVip, 1).lt(ShopUser::getEndTime, DateUtil.date())); List<ShopUser> shopUsers = shopUserService.list(new QueryWrapper().isNotNull(ShopUser::getEndTime).eq(ShopUser::getIsVip, 1).lt(ShopUser::getEndTime, DateUtil.date()));
shopUsers.forEach(item -> { shopUsers.forEach(item -> {

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

@@ -281,6 +281,20 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
return memberLevelVOS; return memberLevelVOS;
} }
static void main() {
Integer expVal = 10;
TableValueConstant.MemberExpFlow.Type type = TableValueConstant.MemberExpFlow.Type.PAY;
long exp = 0;
switch (type) {
case PAY -> {
exp = expVal;
}
}
System.out.println(exp);
}
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean deliver(Long shopId, Long userId, TableValueConstant.MemberExpFlow.Type type, BigDecimal money, Integer expVal, Long sourceId) { public boolean deliver(Long shopId, Long userId, TableValueConstant.MemberExpFlow.Type type, BigDecimal money, Integer expVal, Long sourceId) {
@@ -308,7 +322,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
return false; return false;
} }
log.info("会员奖励发放，类型: {}， 金额: {}, userId: {}", type.getCode(), money, userId); log.info("会员奖励发放，类型: {}， 金额: {}, userId: {}, 经验值: {}", type.getCode(), money, userId, expVal);
long exp = 0; long exp = 0;
switch (type) { switch (type) {
@@ -501,10 +515,11 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
} }
memberOrder.setPayAmount(memberOrder.getAmount());
memberOrder.setStatus(OrderStatusEnums.DONE.getCode()); memberOrder.setStatus(OrderStatusEnums.DONE.getCode());
memberOrderService.updateById(memberOrder); memberOrderService.updateById(memberOrder);
if (memberOrder.getReward() != null) { if (memberOrder.getReward() != null) {
deliver(shopId, userId, TableValueConstant.MemberExpFlow.Type.PAY, memberOrder.getPayAmount(), memberOrder.getReward(), memberOrderId); deliver(shopId, userId, TableValueConstant.MemberExpFlow.Type.PAY, memberOrder.getAmount(), memberOrder.getReward(), memberOrderId);
} }
if (shopUser.getMemberLevelId() == null || shopUser.getMemberLevelId() == 0) { if (shopUser.getMemberLevelId() == null || shopUser.getMemberLevelId() == 0) {
shopUser.setMemberLevelId(levelConfig.getId()); shopUser.setMemberLevelId(levelConfig.getId());