From 6a95ed5c89c710482a306d4201b4119a93193310 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 11 Sep 2023 17:51:27 +0800
Subject: [PATCH] 优惠卷

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 00f656f..1d3fad8 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -212,7 +212,7 @@
                         BigDecimal costAmount = mallGoodsCoupon.getCostAmount();
                         BigDecimal realAmount = mallGoodsCoupon.getRealAmount();
                         if(amount.compareTo(costAmount) >= 0){
-                            amount = amount.subtract(realAmount);
+                            amount = (amount.subtract(realAmount).compareTo(BigDecimal.ZERO) > 0 ? amount.subtract(realAmount) : BigDecimal.ZERO);
                             orderItem.setMemberCouponId(memberCouponId);
                         }
                     }
@@ -224,6 +224,9 @@
                     orderItem.setGoodsName(sku.getGoodsName());
                     orderItem.setSkuId(sku.getId());
                     orderItem.setState(1);
+                    if(ObjectUtil.isNotEmpty(addOrderDto.getMemberInviteId())){
+                        orderItem.setMemberInviteId(addOrderDto.getMemberInviteId());
+                    }
                     orderItem.setStyleName(sku.getStyleName());
                     orderItem.setSkuName(sku.getSkuName());
                     orderItem.setSkuImage(sku.getSkuImage());

--
Gitblit v1.9.1