From faf27967a7f94a4ed03a179ec2670031576f4502 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期五, 07 三月 2025 18:41:41 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 77 ++++++++++++++++----------------------
1 files changed, 32 insertions(+), 45 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index d4e8d6f..e19994f 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -1204,33 +1204,36 @@
BigDecimal balance = appUser.getBalance();
//红包金额满足支付
BigDecimal paymentMoney1 = paymentMoney;
- if(paymentMoney1.compareTo(totalRedPacketAmount) <= 0){
- totalRedPacketAmount = totalRedPacketAmount.subtract(paymentMoney1);
- balance = balance.subtract(paymentMoney1);
- appUser.setTotalRedPacketAmount(totalRedPacketAmount);
- appUser.setBalance(balance);
- redPacketAmount = paymentMoney1;
- }else{
- paymentMoney1 = paymentMoney1.subtract(totalRedPacketAmount);
- redPacketAmount = totalRedPacketAmount;
- totalRedPacketAmount = BigDecimal.ZERO;
- if(paymentMoney1.compareTo(totalDistributionAmount) <= 0){
- totalDistributionAmount = totalDistributionAmount.subtract(paymentMoney1);
- balance = balance.subtract(paymentMoney1);
- appUser.setTotalRedPacketAmount(totalRedPacketAmount);
-// appUser.setTotalDistributionAmount(totalDistributionAmount);
- appUser.setBalance(balance);
- distributionAmount = paymentMoney1;
- }else{
- paymentMoney1 = paymentMoney1.subtract(totalDistributionAmount);
- totalDistributionAmount = BigDecimal.ZERO;
- balance = balance.subtract(paymentMoney1);
- appUser.setTotalRedPacketAmount(totalRedPacketAmount);
-// appUser.setTotalDistributionAmount(totalDistributionAmount);
- appUser.setBalance(balance);
- distributionAmount = totalDistributionAmount;
- }
- }
+ balance = balance.subtract(paymentMoney1);
+ appUser.setBalance(balance);
+
+// if(paymentMoney1.compareTo(totalRedPacketAmount) <= 0){
+// totalRedPacketAmount = totalRedPacketAmount.subtract(paymentMoney1);
+// balance = balance.subtract(paymentMoney1);
+// appUser.setTotalRedPacketAmount(totalRedPacketAmount);
+// appUser.setBalance(balance);
+// redPacketAmount = paymentMoney1;
+// }else{
+// paymentMoney1 = paymentMoney1.subtract(totalRedPacketAmount);
+// redPacketAmount = totalRedPacketAmount;
+// totalRedPacketAmount = BigDecimal.ZERO;
+// if(paymentMoney1.compareTo(totalDistributionAmount) <= 0){
+//// totalDistributionAmount = totalDistributionAmount.subtract(paymentMoney1);
+// balance = balance.subtract(paymentMoney1);
+// appUser.setTotalRedPacketAmount(totalRedPacketAmount);
+//// appUser.setTotalDistributionAmount(totalDistributionAmount);
+// appUser.setBalance(balance);
+// distributionAmount = paymentMoney1;
+// }else{
+// paymentMoney1 = paymentMoney1.subtract(totalDistributionAmount);
+// totalDistributionAmount = BigDecimal.ZERO;
+// balance = balance.subtract(paymentMoney1);
+// appUser.setTotalRedPacketAmount(totalRedPacketAmount);
+//// appUser.setTotalDistributionAmount(totalDistributionAmount);
+// appUser.setBalance(balance);
+// distributionAmount = totalDistributionAmount;
+// }
+// }
//构建积分流水记录
if(earnPoint > 0){
PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData();
@@ -1435,15 +1438,7 @@
orderBalancePaymentService.save(orderBalancePayment);
}
- //异步线程执行分佣临时数据构建
- ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), new ThreadPoolExecutor.DiscardPolicy());
- threadPoolExecutor.execute(new Runnable() {
- @Override
- public void run() {
- commissionService.calculationCommissionUser();
- commissionService.calculationCommissionShop();
- }
- });
+ commissionService.calculationCommissionUser(order.getId());
return R.ok(order.getId().toString());
}
@@ -1548,15 +1543,7 @@
goodsClient.editGoodsNum(goodsId, 1);
}
- //异步线程执行分佣临时数据构建
- ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), new ThreadPoolExecutor.DiscardPolicy());
- threadPoolExecutor.execute(new Runnable() {
- @Override
- public void run() {
- commissionService.calculationCommissionUser();
- commissionService.calculationCommissionShop();
- }
- });
+ commissionService.calculationCommissionUser(order.getId());
return R.ok();
}
--
Gitblit v1.7.1