From b2d29d0498d78e875bfe391c80a8553b5b0ff5a4 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Mon, 27 Oct 2025 16:37:19 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E4=B8=9A=E7=BB=A9=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=A0=E5=93=81=E4=B8=93=E5=8C=BA=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/service/impl/CuMemberServiceImpl.java     | 14 ++++++++++++--
 .../com/hzs/member/census/vo/CensusSummaryVo.java  |  6 ++++++
 .../service/impl/RetailOrderServiceImpl.java       |  2 +-
 .../java/com/hzs/common/core/enums/EOrderType.java |  2 ++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
index be804df0..8179290f 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
@@ -3238,12 +3238,22 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
             censusSummaryVo.setDiscountAmount(disAmount);
             censusSummaryVo.setDiscountPv(disAchieve);
 
+            // 赠品
+            BigDecimal giftPointAmount = BigDecimal.ZERO;
+            BigDecimal giftPointAchieve = BigDecimal.ZERO;
+            if (memberMeritsSummaryMap.get(EOrderType.RETAIL_CONSUME.getValue()) != null) {
+                giftPointAmount = memberMeritsSummaryMap.get(EOrderType.RETAIL_CONSUME.getValue()).getAmount();
+                giftPointAchieve = memberMeritsSummaryMap.get(EOrderType.RETAIL_CONSUME.getValue()).getAchieve();
+            }
+            censusSummaryVo.setGiftPointAmount(giftPointAmount);
+            censusSummaryVo.setGiftPointPv(giftPointAchieve);
+
             // 金额总计
             censusSummaryVo.setAmountTotal(censusSummaryVo.getRegisterAmount().add(censusSummaryVo.getUpgradeAmount())
-                    .add(censusSummaryVo.getRepurchaseAmount()).add(censusSummaryVo.getDiscountAmount()));
+                    .add(censusSummaryVo.getRepurchaseAmount()).add(censusSummaryVo.getDiscountAmount()).add(censusSummaryVo.getGiftPointAmount()));
             // 业绩汇总
             censusSummaryVo.setPvTotal(censusSummaryVo.getRegisterPv().add(censusSummaryVo.getUpgradePv())
-                    .add(censusSummaryVo.getRepurchasePv()).add(censusSummaryVo.getDiscountPv()));
+                    .add(censusSummaryVo.getRepurchasePv()).add(censusSummaryVo.getDiscountPv()).add(censusSummaryVo.getGiftPointPv()));
             censusSummaryList.add(censusSummaryVo);
         }
         return censusSummaryList;
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/census/vo/CensusSummaryVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/census/vo/CensusSummaryVo.java
index b2ad770d..889fb88e 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/census/vo/CensusSummaryVo.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/census/vo/CensusSummaryVo.java
@@ -42,6 +42,12 @@ public class CensusSummaryVo {
 
     @Excel(name = "五折业绩")
     private BigDecimal discountPv;
+
+    @Excel(name = "赠品金额")
+    private BigDecimal giftPointAmount;
+
+    @Excel(name = "赠品业绩")
+    private BigDecimal giftPointPv;
     /**
      * 金额总计
      */
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
index c0645288..42a2f1f4 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
@@ -630,7 +630,7 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
 //            }
         }
 
-        // 在线支付的订单支付方式为钱包
+        // 在线支付的订单支付方式为在线
         saOrderExt.setPayType(EOrderPayType.ONLINE.getValue());
 
         RetailOrderRegisterParam registerParam = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_REG_PARAM + pkMember + orderCode);
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java
index fec67be9..b84a7758 100644
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java
@@ -44,10 +44,12 @@ public enum EOrderType {
      * 复购专区 -- 甄选专区（使用精品专区的商品）
      */
     RETAIL_UPGRADE(42, "复购专区", 0),
+
     /**
      * 北大甄选 -- 商城专区
      */
     RETAIL_REPURCHASE(43, "北大甄选", 0),
+
     /**
      * 赠品订单
      */