From add86a49cc69b6882500c95dd67a2ac826c35526 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 26 七月 2023 20:16:51 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index ca84762..dd6bab7 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -236,8 +236,8 @@
couponType = appMemberCouponVo.getCouponType();
if (couponType == 1 && appMemberCouponVo.getMoneyThreshold() != null && appMemberCouponVo.getDiscountMoney() != null) {
moneyThreshold = appMemberCouponVo.getMoneyThreshold();
- if (goodsTotalPrice.compareTo(moneyThreshold) >= 0) {
- discountMoney = appMemberCouponVo.getDiscountMoney();
+ discountMoney = appMemberCouponVo.getDiscountMoney();
+ if (goodsTotalPrice.compareTo(moneyThreshold) >= 0 && goodsTotalPrice.compareTo(discountMoney)>0) {
goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
useCoupon = 1;
userCouponIdSet.add(memberCouponId);
@@ -252,13 +252,15 @@
appSureOrderGoodsVo.setMemberCouponId(memberCouponId);
} else if (couponType == 3 && appMemberCouponVo.getDiscountMoney() != null) {
discountMoney = appMemberCouponVo.getDiscountMoney();
- goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
- if(goodsRealPrice.compareTo(BigDecimal.ZERO)<0){
- goodsRealPrice = BigDecimal.ZERO;
+ if(goodsTotalPrice.compareTo(discountMoney)>0){
+ goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
+ if(goodsRealPrice.compareTo(BigDecimal.ZERO)<0){
+ goodsRealPrice = BigDecimal.ZERO;
+ }
+ useCoupon = 1;
+ userCouponIdSet.add(memberCouponId);
+ appSureOrderGoodsVo.setMemberCouponId(memberCouponId);
}
- useCoupon = 1;
- userCouponIdSet.add(memberCouponId);
- appSureOrderGoodsVo.setMemberCouponId(memberCouponId);
}
}
}
@@ -302,10 +304,14 @@
appGoodsMemberCouponVoList = new ArrayList<>();
for(AppMemberCouponVo entity : appMemberCouponVoList){
if(StringUtils.isBlank(entity.getRelGoodsIds())||entity.getRelGoodsIds().contains(sureOrderGoodsVo.getGoodsId())){
- if(entity.getCouponType()!=1){
+ if(entity.getCouponType()==1){
+ if(entity.getMoneyThreshold().compareTo(sureOrderGoodsVo.getGoodsTotalPrice())<0&&entity.getDiscountMoney().compareTo(sureOrderGoodsVo.getGoodsTotalPrice())<0){
+ appGoodsMemberCouponVoList.add(entity);
+ }
+ }else if(entity.getCouponType()==2){
appGoodsMemberCouponVoList.add(entity);
- }else{
- if(entity.getMoneyThreshold().compareTo(sureOrderGoodsVo.getGoodsTotalPrice())<0){
+ }else if(entity.getCouponType()==3){
+ if(entity.getDiscountMoney().compareTo(sureOrderGoodsVo.getGoodsTotalPrice())<0){
appGoodsMemberCouponVoList.add(entity);
}
}
@@ -3102,7 +3108,9 @@
*/
@Override
public MerTotalOrderVo totalMerOrder(MerBaseDto merBaseDto) {
- return orderMapper.totalMerOrder(merBaseDto.getShopId());
+ MerTotalOrderVo merTotalOrderVo = new MerTotalOrderVo();
+ merTotalOrderVo = orderMapper.totalMerOrder(merBaseDto.getShopId());
+ return merTotalOrderVo;
}
/**
--
Gitblit v1.7.1