czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 霸王餐不送券

Browse Source
This commit is contained in:
张松
2024-11-23 16:00:09 +08:00
parent b8d5195622
commit b76f1f5620
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -1743,11 +1743,12 @@ public class PayService {
checkFreeDineForMemberInCallBack(memberIn, payType, payOrderNO); checkFreeDineForMemberInCallBack(memberIn, payType, payOrderNO);
//会员活动 //会员活动
BigDecimal awardAmount = giveActivate(tbShopUser, memberIn.getAmount(), flow.getId()); BigDecimal awardAmount = null;
//充值送积分 //充值送积分
TbActivate activate = tbActivateMapper.selectByAmountScope(tbShopUser.getShopId(), memberIn.getAmount()); TbActivate activate = tbActivateMapper.selectByAmountScope(tbShopUser.getShopId(), memberIn.getAmount());
if (memberIn.getOrderId() == null && ObjectUtil.isNotNull(activate)) { if (memberIn.getOrderId() == null && ObjectUtil.isNotNull(activate)) {
awardAmount = giveActivate(tbShopUser, memberIn.getAmount(), flow.getId());
tbMemberPointsService.addPoints(Convert.toLong(tbShopUser.getId()), activate.getGiftPoints(), StrUtil.format("充值￥{}送{}积分", memberIn.getAmount(), activate.getGiftPoints()), null, memberIn.getOrderNo()); tbMemberPointsService.addPoints(Convert.toLong(tbShopUser.getId()), activate.getGiftPoints(), StrUtil.format("充值￥{}送{}积分", memberIn.getAmount(), activate.getGiftPoints()), null, memberIn.getOrderNo());
} }
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();