From 7e9667699856022efcac2941eacddd25e20d0c1f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 15:40:06 +0800
Subject: [PATCH] 新增加管理后台订单模块接口
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 65b8f29..67d77ee 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
@@ -15,12 +15,10 @@
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.mapper.ShoppingCartMapper;
import com.ruoyi.order.model.Order;
+import com.ruoyi.order.model.OrderBalancePayment;
import com.ruoyi.order.model.OrderGood;
import com.ruoyi.order.model.ShoppingCart;
-import com.ruoyi.order.service.CommissionService;
-import com.ruoyi.order.service.OrderGoodService;
-import com.ruoyi.order.service.OrderService;
-import com.ruoyi.order.service.ShoppingCartService;
+import com.ruoyi.order.service.*;
import com.ruoyi.order.vo.*;
import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.api.feignClient.*;
@@ -107,6 +105,9 @@
@Resource
private PointSettingClient pointSettingClient;
+
+ @Resource
+ private OrderBalancePaymentService orderBalancePaymentService;
@@ -923,17 +924,22 @@
}
//账户余额
+ BigDecimal redPacketAmount = BigDecimal.ZERO;
+ BigDecimal distributionAmount = BigDecimal.ZERO;
if(2 == shoppingCartPayment.getPaymentType()){
BigDecimal totalRedPacketAmount = appUser.getTotalRedPacketAmount();
BigDecimal totalDistributionAmount = appUser.getTotalDistributionAmount();
BigDecimal balance = appUser.getBalance();
+ //红包金额满足支付
if(paymentMoney.compareTo(totalRedPacketAmount) <= 0){
totalRedPacketAmount = totalRedPacketAmount.subtract(paymentMoney);
balance = balance.subtract(paymentMoney);
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setBalance(balance);
+ redPacketAmount = paymentMoney;
}else{
paymentMoney = paymentMoney.subtract(totalRedPacketAmount);
+ redPacketAmount = totalRedPacketAmount;
totalRedPacketAmount = BigDecimal.ZERO;
if(paymentMoney.compareTo(totalDistributionAmount) <= 0){
totalDistributionAmount = totalDistributionAmount.subtract(paymentMoney);
@@ -941,6 +947,7 @@
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setTotalDistributionAmount(totalDistributionAmount);
appUser.setBalance(balance);
+ distributionAmount = paymentMoney;
}else{
paymentMoney = paymentMoney.subtract(totalDistributionAmount);
totalDistributionAmount = BigDecimal.ZERO;
@@ -948,6 +955,7 @@
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setTotalDistributionAmount(totalDistributionAmount);
appUser.setBalance(balance);
+ distributionAmount = totalDistributionAmount;
}
}
//构建积分流水记录
@@ -1006,7 +1014,6 @@
appUser.setShopPoint(appUser.getShopPoint() + earnPoint);
appUser.setLavePoint(appUser.getLavePoint() + earnPoint1);
appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint);
- appUser.setShopAmount(appUser.getShopAmount().add(paymentMoney).setScale(2, RoundingMode.HALF_EVEN));
appUser.setLastShopTime(LocalDateTime.now());
appUserClient.editAppUserById(appUser);
//检查消费积分满足后升级会员
@@ -1016,7 +1023,8 @@
UserPoint userPoint = new UserPoint();
userPoint.setType(1);
userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(orderPoint);
+ Integer point = appUser.getLavePoint() - lavePoint;
+ userPoint.setVariablePoint(point >= 0 ? point : point * -1);
userPoint.setBalance(appUser.getLavePoint());
userPoint.setCreateTime(LocalDateTime.now());
userPoint.setAppUserId(appUser.getId());
@@ -1036,8 +1044,10 @@
balance = balance.subtract(expressFee);
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setBalance(balance);
+ redPacketAmount = expressFee;
}else{
expressFee = expressFee.subtract(totalRedPacketAmount);
+ redPacketAmount = totalRedPacketAmount;
totalRedPacketAmount = BigDecimal.ZERO;
if(expressFee.compareTo(totalDistributionAmount) <= 0){
totalDistributionAmount = totalDistributionAmount.subtract(expressFee);
@@ -1045,6 +1055,7 @@
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setTotalDistributionAmount(totalDistributionAmount);
appUser.setBalance(balance);
+ distributionAmount = expressFee;
}else{
expressFee = expressFee.subtract(totalDistributionAmount);
totalDistributionAmount = BigDecimal.ZERO;
@@ -1052,6 +1063,7 @@
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setTotalDistributionAmount(totalDistributionAmount);
appUser.setBalance(balance);
+ distributionAmount = totalDistributionAmount;
}
}
@@ -1081,6 +1093,14 @@
this.removeBatchByIds(ids);
}
}
+ //添加账户余额支付明细
+ if(redPacketAmount.compareTo(BigDecimal.ZERO) > 0 || distributionAmount.compareTo(BigDecimal.ZERO) > 0){
+ OrderBalancePayment orderBalancePayment = new OrderBalancePayment();
+ orderBalancePayment.setOrderId(order.getId());
+ orderBalancePayment.setRedPacketAmount(redPacketAmount);
+ orderBalancePayment.setDistributionAmount(distributionAmount);
+ orderBalancePaymentService.save(orderBalancePayment);
+ }
return R.ok(order.getId().toString());
}
--
Gitblit v1.7.1