From c410d4faa4b0049c700b046be466c2f69a19d8d8 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Fri, 13 Jun 2025 17:52:00 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=8D=E8=B4=AD=E5=8C=BA=E5=9F=9F=E5=88=86?=
 =?UTF-8?q?=E7=BA=A2=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wares/controller/manage/BdWaresController.java   |  1 +
 .../java/com/hzs/sale/wares/param/WaresParams.java   | 12 +++++-------
 .../resources/mapper/sale/wares/BdWaresMapper.xml    |  2 +-
 .../com/hzs/common/domain/sale/wares/BdWares.java    |  6 ++++++
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java
index d1550472..33361086 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java
@@ -541,6 +541,7 @@ public class BdWaresController extends BaseController {
         waresParams.setPkSpecialCurrency(waresExtend.getPkSpecialCurrency());
         waresParams.setSortStatus(wares.getSortStatus());
         waresParams.setSystemType(waresExtend.getSystemType());
+        waresParams.setAreaIncome(wares.getAreaIncome());
         if (waresExtend.getMakerIncome() != null) {
             R<CurrencyDTO> currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
             waresParams.setMakerIncome(waresExtend.getMakerIncome().multiply(currencyDto.getData().getInExchangeRate()));
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java
index a174c808..810cb34e 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java
@@ -9,13 +9,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-/**
- * @Description:
- * @Author: yuhui
- * @Time: 2022/9/9 14:14
- * @Classname: WaresParams
- * @PackageName: com.hzs.sale.wares.controller.manage.params
- */
 @Data
 public class WaresParams implements Serializable {
     /**
@@ -416,4 +409,9 @@ public class WaresParams implements Serializable {
      */
     private Integer waresStatus;
 
+    /**
+     * 复购区域分红
+     */
+    private BigDecimal areaIncome;
+
 }
diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml
index da3e9700..64158386 100644
--- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml
@@ -46,9 +46,9 @@
         <result column="DETAILS_TYPE" property="detailsType"/>
         <result column="AFTER_GUARANTEE" property="afterGuarantee"/>
         <result column="giftNames" property="giftNames"/>
-        <result column="maker_income" property="makerIncome"/>
         <result column="PK_SPECIAL_CURRENCY" property="pkSpecialCurrency"/>
         <result column="SYSTEM_TYPE" property="systemType"/>
+        <result column="AREA_INCOME" property="areaIncome"/>
     </resultMap>
 
     <resultMap id="resultMap" type="com.hzs.sale.wares.vo.WaresVo">
diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java
index c7882dd9..dd038016 100644
--- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java
+++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java
@@ -216,4 +216,10 @@ public class BdWares extends BaseEntity {
     @TableField("SYSTEM_TYPE")
     private Integer systemType;
 
+    /**
+     * 复购区域分红
+     */
+    @TableField("AREA_INCOME")
+    private BigDecimal areaIncome;
+
 }