From ae43f60f8b4a886bff190032676664b00a398ca4 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Tue, 8 Apr 2025 20:22:36 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E4=B9=90=E5=AD=A6=E5=A4=8D=E8=B4=AD?=
 =?UTF-8?q?=E4=B8=93=E5=8C=BA=E5=A4=84=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sale/order/service/impl/SaOrderServiceImpl.java |  2 +-
 .../service/impl/ShoppingCartServiceImpl.java       |  1 +
 .../service/impl/BdWaresSpecsSkuServiceImpl.java    | 13 ++++++++++---
 .../mapper/sale/wares/BdWaresDetailMapper.xml       |  2 +-
 .../hzs/common/core/constant/CacheConstants.java    |  2 +-
 .../java/com/hzs/common/core/enums/EAccount.java    |  4 ++--
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
index c5f41341..43c7d951 100644
--- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
+++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
@@ -1730,7 +1730,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
                         cuMember.setConsumeAchieve(gradeDTO.getStartValue());
                     }
 
-                    // 乐学升级需要抽除代金券
+                    // 乐学升级需要扣除代金券
                     if (EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) {
                         iAcPickService.deductionsCouponByOrder(saOrderExt.getPkMember(), saOrderExt.getPkId());
                     }
diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/shopping/service/impl/ShoppingCartServiceImpl.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/shopping/service/impl/ShoppingCartServiceImpl.java
index 7b646496..54eb1ef9 100644
--- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/shopping/service/impl/ShoppingCartServiceImpl.java
+++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/shopping/service/impl/ShoppingCartServiceImpl.java
@@ -237,6 +237,7 @@ public class ShoppingCartServiceImpl implements IShoppingCartService {
             }
         }
 
+        // 购物车中显示的商品价格
         shoppingCart.setWaresPrice(waresPrice);
         shoppingCart.setAchieve(achieve);
         shoppingCart.setAssAchieve(assAchieve);
diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java
index f62f8586..8ac4c634 100644
--- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java
+++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java
@@ -231,7 +231,8 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
     public CuWaresParams queryWaresSpecsSkuCount(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry) {
         List<BdWaresSpecsSkuExt> bdWaresSpecsSkuExtList;
 
-        if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
+        if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea
+                || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
             R<CuMember> memberDate = memberServiceApi.getMember(loginMemberId);
             CuMember cuMember = memberDate.getData();
 
@@ -372,8 +373,14 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
             } else {
                 price = MagicNumberConstants.LXYK_V1;
             }
-            int finalPrice = price.intValue() / productParamsResultList.size();
-            productParamsResultList.forEach(param -> param.getWaresItemsParamsList().forEach(item -> item.setPriceTotal(new BigDecimal(finalPrice))));
+            BigDecimal finalPrice = price;
+            productParamsResultList.forEach(param -> param.getWaresItemsParamsList().forEach(item -> {
+                if (EYesNo.NO.getIntValue() == item.getIsGift()) {
+                    // 非赠品
+                    item.setPrice(finalPrice);
+                    item.setPriceTotal(finalPrice.multiply(new BigDecimal(item.getQuantity())));
+                }
+            }));
         }
 
         cuWaresParams.setProductParams(productParamsResultList);
diff --git a/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml b/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml
index f6a3b5ff..64712a37 100644
--- a/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml
+++ b/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml
@@ -45,7 +45,7 @@
     </resultMap>
 
     <select id="queryWaresDetailByCondition" resultMap="BdWaresDetailExt">
-        <foreach collection="orderItemsParams" item="item" index="index" separator="union">
+        <foreach collection="orderItemsParams" item="item" index="index" separator=" union all ">
             select bd.pk_id,bs.pk_id pk_wares_specs_sku,bw.is_free_mail,be.pk_land_postage,
             be.pk_air_postage,be.pk_ocean_postage,bw.pk_id pk_wares,be.is_maker_gift,be.pre_sale_status,
             be.pk_special_currency,bw.wares_code, bw.wares_name, bd.is_gift is_gift,
diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java
index ef049ba7..533f84cf 100644
--- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java
+++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java
@@ -299,7 +299,7 @@ public class CacheConstants {
     /**
      * 购物车
      */
-    public static final String SHOPPIN_GCART = CACHE_PREFIX + "shoppin:gcart:";
+    public static final String SHOPPIN_GCART = CACHE_PREFIX + "shopping:cart:";
 
     /**
      * 短信缓存key前缀
diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EAccount.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EAccount.java
index 5add863e..38d65847 100644
--- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EAccount.java
+++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EAccount.java
@@ -69,9 +69,9 @@ public enum EAccount {
     LIVE_CASH_COUPON(11, "直播代金券", EnumsPrefixConstants.ACCOUNT + "11"),
 
     /**
-     * 代金券
+     * 法宝券
      */
-    CASH_COUPON(12, "乐学代金券", EnumsPrefixConstants.ACCOUNT + "12"),
+    CASH_COUPON(12, "法宝券", EnumsPrefixConstants.ACCOUNT + "12"),
 
 //    /**
 //     * 海豆账号