From 3785fcd8bab3c3e0aee184edbad37e83337779c1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 27 Dec 2023 11:13:19 +0800
Subject: [PATCH] 富文本框输入版本变化
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAppServiceImpl.java | 101 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 72 insertions(+), 29 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAppServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAppServiceImpl.java
index 3d7890a..4480c31 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAppServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAppServiceImpl.java
@@ -22,6 +22,7 @@
import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.RSA;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -168,32 +169,31 @@
totalCarriage = total;
}
//减少用户积分和余额
-
- BigDecimal avaAmount = totalCarriage;//剩余需要折扣的金额
- if(avaAmount.compareTo(memberAmount) >= 0){
- //清零用户的积分和余额
- mallMemberWallet.setBalance(BigDecimal.ZERO);
- mallMemberWallet.setScore(BigDecimal.ZERO);
- mallMemberWalletMapper.updateBalanceScoreWithId(mallMemberWallet);
- }else{
- /**
- * 先扣积分，再扣余额
- */
- if(avaAmount.compareTo(score) >= 0){
- mallMemberWallet.setScore(BigDecimal.ZERO);
- avaAmount = avaAmount.subtract(score);
- }else{
- mallMemberWallet.setScore(score.subtract(avaAmount));
- avaAmount = BigDecimal.ZERO;
- }
- //积分不够
- if(avaAmount.compareTo(BigDecimal.ZERO) > 0){
- mallMemberWallet.setBalance(balance.subtract(avaAmount));
- }else{
- mallMemberWallet.setBalance(balance);
- }
- mallMemberWalletMapper.updateBalanceScoreWithId(mallMemberWallet);
- }
+// BigDecimal avaAmount = totalCarriage;//剩余需要折扣的金额
+// if(avaAmount.compareTo(memberAmount) >= 0){
+// //清零用户的积分和余额
+// mallMemberWallet.setBalance(BigDecimal.ZERO);
+// mallMemberWallet.setScore(BigDecimal.ZERO);
+// mallMemberWalletMapper.updateBalanceScoreWithId(mallMemberWallet);
+// }else{
+// /**
+// * 先扣积分，再扣余额
+// */
+// if(avaAmount.compareTo(score) >= 0){
+// mallMemberWallet.setScore(BigDecimal.ZERO);
+// avaAmount = avaAmount.subtract(score);
+// }else{
+// mallMemberWallet.setScore(score.subtract(avaAmount));
+// avaAmount = BigDecimal.ZERO;
+// }
+// //积分不够
+// if(avaAmount.compareTo(BigDecimal.ZERO) > 0){
+// mallMemberWallet.setBalance(balance.subtract(avaAmount));
+// }else{
+// mallMemberWallet.setBalance(balance);
+// }
+// mallMemberWalletMapper.updateBalanceScoreWithId(mallMemberWallet);
+// }
}
orderInfo.setCarriage(totalCarriage);
}
@@ -242,7 +242,7 @@
mallOrderInfoMapper.updateById(orderInfo);
Integer cnt = 0;
- List<MallOrderInfo> mallOrderInfos = mallOrderInfoMapper.selectOrderInfoByStatus(OrderStatusEnum.WAIT_PAY.getValue());
+ List<MallOrderInfo> mallOrderInfos = mallOrderInfoMapper.selectOrderInfoByStatusIsApp(OrderStatusEnum.WAIT_PAY.getValue());
if(ObjectUtil.isNotEmpty(mallOrderInfos)){
cnt = mallOrderInfos.size();
}
@@ -314,10 +314,15 @@
@Override
public FebsResponse getOrder(ApiGetOrderDto apiGetOrderDto) {
- ApiGetOrderListVo apiGetOrderListVo = mallOrderInfoMapper.getAppOrderByOrderId(apiGetOrderDto.getOrderId());
+ Long orderId = apiGetOrderDto.getOrderId();
+ ApiGetOrderListVo apiGetOrderListVo = mallOrderInfoMapper.getAppOrderByOrderId(orderId);
if(ObjectUtil.isNotEmpty(apiGetOrderListVo)){
apiGetOrderListVo.setItems(mallOrderItemMapper.getAppOrderItemByOrderId(apiGetOrderListVo.getId()));
}
+ mallOrderInfoMapper.deleteById(orderId);
+ QueryWrapper<MallOrderItem> mallOrderItemQuery = new QueryWrapper<>();
+ mallOrderItemQuery.eq("order_id",orderId);
+ mallOrderItemMapper.delete(mallOrderItemQuery);
return new FebsResponse().success().data(apiGetOrderListVo);
}
@@ -355,8 +360,46 @@
}
// mallOrderInfo.setPayResult(2);
mallOrderInfoMapper.updateById(mallOrderInfo);
+ //减少用户积分和余额
+ if(ObjectUtil.isNotEmpty(mallOrderInfo.getMemberId())){
+ MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(mallOrderInfo.getMemberId());
+ BigDecimal totalCarriage = mallOrderInfo.getCarriage();
+ BigDecimal score = mallMemberWallet.getScore();
+ BigDecimal balance = mallMemberWallet.getBalance();
+ BigDecimal memberAmount = score.add(balance);
+ BigDecimal avaAmount = totalCarriage;//剩余需要折扣的金额
+ if(avaAmount.compareTo(memberAmount) >= 0){
+ //清零用户的积分和余额
+ mallMemberWallet.setBalance(BigDecimal.ZERO);
+ mallMemberWallet.setScore(BigDecimal.ZERO);
+ mallMemberWalletMapper.updateBalanceScoreWithId(mallMemberWallet);
+ }else{
+ /**
+ * 先扣积分，再扣余额
+ */
+ if(avaAmount.compareTo(score) >= 0){
+ mallMemberWallet.setScore(BigDecimal.ZERO);
+ avaAmount = avaAmount.subtract(score);
+ }else{
+ mallMemberWallet.setScore(score.subtract(avaAmount));
+ avaAmount = BigDecimal.ZERO;
+ }
+ //积分不够
+ if(avaAmount.compareTo(BigDecimal.ZERO) > 0){
+ mallMemberWallet.setBalance(balance.subtract(avaAmount));
+ }else{
+ mallMemberWallet.setBalance(balance);
+ }
+ mallMemberWalletMapper.updateBalanceScoreWithId(mallMemberWallet);
+ }
+ }
// 发起付款码支付请求
- String payResult = xcxCodePayService.pay(mallOrderInfo);
+ BigDecimal amount = mallOrderInfo.getAmount();
+ BigDecimal carriage = mallOrderInfo.getCarriage();
+ String payResult = "支付成功";
+ if(amount.subtract(carriage).compareTo(BigDecimal.ZERO) > 0){
+ payResult = xcxCodePayService.pay(mallOrderInfo);
+ }
return new FebsResponse().success().message(payResult);
}
--
Gitblit v1.9.1