zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理积分抵扣

Browse Source
This commit is contained in:
wuchunlei
2025-06-27 14:45:58 +08:00
parent 293a0d0b96
commit 083de33fed
2 changed files with 9 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java
View File

@@ -173,6 +173,10 @@ public class AliPayServiceImpl implements AliPayService {
couponHistory.setOrderId(order.getOrderId()); couponHistory.setOrderId(order.getOrderId());
couponService.useCouponAmount(couponHistory); couponService.useCouponAmount(couponHistory);
} }
//处理抵扣积分
if(order.getJfDeduction().compareTo(BigDecimal.ZERO)>0){
userCoinJf(order);
}
if("trainingClass".equals(subject)){ if("trainingClass".equals(subject)){
//更新 订单 记录 //更新 订单 记录
@@ -182,10 +186,6 @@ public class AliPayServiceImpl implements AliPayService {
} }
if("relearn".equals(subject)){ if("relearn".equals(subject)){
//处理抵扣积分
if(order.getJfDeduction().compareTo(BigDecimal.ZERO)>0){
userCoinJf(order);
}
//更新 订单 记录 //更新 订单 记录
buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"2"); buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"2");
//插入复读记录 //插入复读记录
@@ -195,10 +195,6 @@ public class AliPayServiceImpl implements AliPayService {
if ("vip".equals(subject)) { if ("vip".equals(subject)) {
//更新 订单 记录 //更新 订单 记录
buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"2"); buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"2");
//处理抵扣积分
if(order.getJfDeduction().compareTo(BigDecimal.ZERO)>0){
userCoinJf(order);
}
//开通vip //开通vip
userVipService.openVipForUser(order); userVipService.openVipForUser(order);
} }
@@ -206,10 +202,6 @@ public class AliPayServiceImpl implements AliPayService {
if ("aiVip".equals(subject)) { if ("aiVip".equals(subject)) {
//更新 订单 记录 //更新 订单 记录
buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"2"); buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"2");
//处理抵扣积分
if(order.getJfDeduction().compareTo(BigDecimal.ZERO)>0){
userCoinJf(order);
}
//开通aivip //开通aivip
aiVipLogService.openAiVip(order); aiVipLogService.openAiVip(order);
} }
@@ -248,10 +240,6 @@ public class AliPayServiceImpl implements AliPayService {
//更新 订单 记录 //更新 订单 记录
String ActString = buyOrderService.checkWlOrder(order.getOrderSn())?"0":"2"; String ActString = buyOrderService.checkWlOrder(order.getOrderSn())?"0":"2";
buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),ActString); buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),ActString);
//处理抵扣积分
if(order.getJfDeduction().compareTo(BigDecimal.ZERO)>0){
userCoinJf(order);
}
/* 记录用户购买的书籍 */ /* 记录用户购买的书籍 */
// 查询订单的所有 book_id // 查询订单的所有 book_id
List<Integer> orderBookIdList = shopProductBookDao.getOrderBookId(order.getOrderSn()); List<Integer> orderBookIdList = shopProductBookDao.getOrderBookId(order.getOrderSn());

22
src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
View File

@@ -161,7 +161,10 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
couponHistory.setOrderId(order.getOrderId()); couponHistory.setOrderId(order.getOrderId());
couponService.useCouponAmount(couponHistory); couponService.useCouponAmount(couponHistory);
} }
//处理抵扣积分
if(order.getJfDeduction().compareTo(BigDecimal.ZERO)>0){
userCoinJf(order);
}
if("trainingClass".equals(order.getOrderType())){ if("trainingClass".equals(order.getOrderType())){
//更新 订单 记录 //更新 订单 记录
buyOrderService.updateOrderStatus(order.getUserId(),orderNo,"2"); buyOrderService.updateOrderStatus(order.getUserId(),orderNo,"2");
@@ -169,10 +172,6 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
trainingClassService.addTrainingClassForUser(order); trainingClassService.addTrainingClassForUser(order);
} }
if("relearn".equals(order.getOrderType())){ if("relearn".equals(order.getOrderType())){
//处理抵扣积分
if(order.getJfDeduction().compareTo(BigDecimal.ZERO)>0){
userCoinJf(order);
}
//更新 订单 记录 //更新 订单 记录
buyOrderService.updateOrderStatus(order.getUserId(),orderNo,"2"); buyOrderService.updateOrderStatus(order.getUserId(),orderNo,"2");
//插入复读记录 //插入复读记录
@@ -182,10 +181,6 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
if("vip".equals(order.getOrderType())){ if("vip".equals(order.getOrderType())){
//更新 订单 记录 //更新 订单 记录
buyOrderService.updateOrderStatus(order.getUserId(),orderNo,"2"); buyOrderService.updateOrderStatus(order.getUserId(),orderNo,"2");
//处理抵扣积分
if(order.getJfDeduction().compareTo(BigDecimal.ZERO)>0){
userCoinJf(order);
}
//开通vip //开通vip
userVipService.openVipForUser(order); userVipService.openVipForUser(order);
} }
@@ -193,20 +188,11 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
if("aiVip".equals(order.getOrderType())){ if("aiVip".equals(order.getOrderType())){
//更新 订单 记录 //更新 订单 记录
buyOrderService.updateOrderStatus(order.getUserId(),orderNo,"2"); buyOrderService.updateOrderStatus(order.getUserId(),orderNo,"2");
//处理抵扣积分
if(order.getJfDeduction().compareTo(BigDecimal.ZERO)>0){
userCoinJf(order);
}
//开通aivip //开通aivip
aiVipLogService.openAiVip(order); aiVipLogService.openAiVip(order);
} }
// 1.根据订单id获取订单信息 // 1.根据订单id获取订单信息
if ("order".equals(order.getOrderType())) { if ("order".equals(order.getOrderType())) {
if(order.getJfDeduction().compareTo(BigDecimal.ZERO)>0){
userCoinJf(order);
}
//开通book，start //开通book，start
// 查询订单的所有 book_id // 查询订单的所有 book_id
List<Integer> orderBookIdList = shopProductBookService.getOrderBookId(order.getOrderSn()); List<Integer> orderBookIdList = shopProductBookService.getOrderBookId(order.getOrderSn());