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:08:11 +08:00
parent b76f1f5620
commit d390054f07
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1294,7 +1294,7 @@ public class PayService {
* @param payType 支付平台 * @param payType 支付平台
* @param payOrderNO 三方支付订单号 * @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<TbCashierCart>() int cartCount = mpCashierCartMapper.update(null, new LambdaUpdateWrapper<TbCashierCart>()
.eq(TbCashierCart::getOrderId, orderInfo.getId()) .eq(TbCashierCart::getOrderId, orderInfo.getId())
// .eq(TbCashierCart::getUseType, orderInfo.getUseType()) // .eq(TbCashierCart::getUseType, orderInfo.getUseType())
@@ -1322,7 +1322,9 @@ public class PayService {
tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo); 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 jsonObject = new JSONObject();
jsonObject.put("token", 0); jsonObject.put("token", 0);
@@ -1386,7 +1388,7 @@ public class PayService {
} }
if ("paying".equals(orderInfo.getStatus())) { if ("paying".equals(orderInfo.getStatus())) {
orderSuccessPay(orderInfo, payType, payOrderNO); orderSuccessPay(orderInfo, payType, payOrderNO, false);
return "SUCCESS"; return "SUCCESS";
@@ -1683,7 +1685,7 @@ public class PayService {
shopCouponService.use(shopId, orderInfo.getId(), Integer.valueOf(orderInfo.getUserId()), activateOutRecords); 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()); // TbFreeDineRecord freeDineRecord = freeDineRecordService.selectByOrderId(orderInfo.getId());