diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 9671cf8..2fe445b 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -1743,11 +1743,12 @@ public class PayService { checkFreeDineForMemberInCallBack(memberIn, payType, payOrderNO); //会员活动 - BigDecimal awardAmount = giveActivate(tbShopUser, memberIn.getAmount(), flow.getId()); + BigDecimal awardAmount = null; //充值送积分 TbActivate activate = tbActivateMapper.selectByAmountScope(tbShopUser.getShopId(), memberIn.getAmount()); 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()); } JSONObject jsonObject = new JSONObject();