From 083de33fedfe1421b68eae3b34a797701480a054 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Fri, 27 Jun 2025 14:45:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=A7=AF=E5=88=86=E6=8A=B5?= =?UTF-8?q?=E6=89=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AliPayServiceImpl.java | 22 +++++-------------- .../service/impl/WxpayServiceImpl.java | 22 ++++--------------- 2 files changed, 9 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java index fdf241bf..bd11fbca 100644 --- a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java +++ b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java @@ -173,6 +173,10 @@ public class AliPayServiceImpl implements AliPayService { couponHistory.setOrderId(order.getOrderId()); couponService.useCouponAmount(couponHistory); } + //处理抵扣积分 + if(order.getJfDeduction().compareTo(BigDecimal.ZERO)>0){ + userCoinJf(order); + } if("trainingClass".equals(subject)){ //更新 订单 记录 @@ -182,10 +186,6 @@ public class AliPayServiceImpl implements AliPayService { } if("relearn".equals(subject)){ - //处理抵扣积分 - if(order.getJfDeduction().compareTo(BigDecimal.ZERO)>0){ - userCoinJf(order); - } //更新 订单 记录 buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"2"); //插入复读记录 @@ -195,21 +195,13 @@ public class AliPayServiceImpl implements AliPayService { if ("vip".equals(subject)) { //更新 订单 记录 buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"2"); - //处理抵扣积分 - if(order.getJfDeduction().compareTo(BigDecimal.ZERO)>0){ - userCoinJf(order); - } - //开通vip + //开通vip userVipService.openVipForUser(order); } if ("aiVip".equals(subject)) { //更新 订单 记录 buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"2"); - //处理抵扣积分 - if(order.getJfDeduction().compareTo(BigDecimal.ZERO)>0){ - userCoinJf(order); - } //开通aivip aiVipLogService.openAiVip(order); } @@ -248,10 +240,6 @@ public class AliPayServiceImpl implements AliPayService { //更新 订单 记录 String ActString = buyOrderService.checkWlOrder(order.getOrderSn())?"0":"2"; buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),ActString); - //处理抵扣积分 - if(order.getJfDeduction().compareTo(BigDecimal.ZERO)>0){ - userCoinJf(order); - } /* 记录用户购买的书籍 */ // 查询订单的所有 book_id List orderBookIdList = shopProductBookDao.getOrderBookId(order.getOrderSn()); diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java index 2ee43e68..a7cd3840 100644 --- a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java +++ b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java @@ -161,7 +161,10 @@ public class WxpayServiceImpl extends ServiceImpl0){ + userCoinJf(order); + } if("trainingClass".equals(order.getOrderType())){ //更新 订单 记录 buyOrderService.updateOrderStatus(order.getUserId(),orderNo,"2"); @@ -169,10 +172,6 @@ public class WxpayServiceImpl extends ServiceImpl0){ - userCoinJf(order); - } //更新 订单 记录 buyOrderService.updateOrderStatus(order.getUserId(),orderNo,"2"); //插入复读记录 @@ -182,10 +181,6 @@ public class WxpayServiceImpl extends ServiceImpl0){ - userCoinJf(order); - } //开通vip userVipService.openVipForUser(order); } @@ -193,20 +188,11 @@ public class WxpayServiceImpl extends ServiceImpl0){ - userCoinJf(order); - } //开通aivip aiVipLogService.openAiVip(order); } - // 1.根据订单id获取订单信息 if ("order".equals(order.getOrderType())) { - if(order.getJfDeduction().compareTo(BigDecimal.ZERO)>0){ - userCoinJf(order); - } - //开通book，start // 查询订单的所有 book_id List orderBookIdList = shopProductBookService.getOrderBookId(order.getOrderSn());