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 2fe445b..d91214f 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -1294,7 +1294,7 @@ public class PayService { * @param payType 支付平台 * @param payOrderNO 三方支付订单号 */ - private void orderSuccessPay(TbOrderInfo orderInfo, String payType, String payOrderNO) { + private void orderSuccessPay(TbOrderInfo orderInfo, String payType, String payOrderNO, boolean isFreeDine) { int cartCount = mpCashierCartMapper.update(null, new LambdaUpdateWrapper() .eq(TbCashierCart::getOrderId, orderInfo.getId()) // .eq(TbCashierCart::getUseType, orderInfo.getUseType()) @@ -1322,7 +1322,9 @@ public class PayService { tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo); // 消费送积分 - tbMemberPointsService.consumeAwardPoints(Long.valueOf(orderInfo.getMemberId()), Long.valueOf(orderInfo.getId())); + if (!isFreeDine) { + tbMemberPointsService.consumeAwardPoints(Long.valueOf(orderInfo.getMemberId()), Long.valueOf(orderInfo.getId())); + } JSONObject jsonObject = new JSONObject(); jsonObject.put("token", 0); @@ -1386,7 +1388,7 @@ public class PayService { } if ("paying".equals(orderInfo.getStatus())) { - orderSuccessPay(orderInfo, payType, payOrderNO); + orderSuccessPay(orderInfo, payType, payOrderNO, false); return "SUCCESS"; @@ -1683,7 +1685,7 @@ public class PayService { shopCouponService.use(shopId, orderInfo.getId(), Integer.valueOf(orderInfo.getUserId()), activateOutRecords); } // 更改订单状态 - orderSuccessPay(orderInfo, payType, payOrderNo); + orderSuccessPay(orderInfo, payType, payOrderNo, true); // 更改霸王餐记录 // TbFreeDineRecord freeDineRecord = freeDineRecordService.selectByOrderId(orderInfo.getId());