From 7766c46086d15003810a0c6076dc33713622188d Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Mon, 30 Jun 2025 16:35:22 +0800
Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E7=9B=92=E6=95=B0=E5=B0=8F?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/manage/CuMemberSpeRetailController.java   | 9 ++++++---
 .../java/com/hzs/bonus/bonus/param/RetailAreaParam.java  | 6 +++---
 .../common/domain/member/bonus/CuMemberSpeRetail.java    | 6 +++---
 sql/2025年6月30日-注水盒数小数位.sql                     | 4 ++++
 4 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 sql/2025年6月30日-注水盒数小数位.sql

diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberSpeRetailController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberSpeRetailController.java
index 28b1f008..c2335b02 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberSpeRetailController.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberSpeRetailController.java
@@ -68,7 +68,8 @@ public class CuMemberSpeRetailController extends BaseController {
             return AjaxResult.error("会员信息不存在");
         }
         //校验团队总盒数大于小区盒数
-        if (retailAreaParam.getTeamBoxNum() < retailAreaParam.getSmallBoxNum()) {
+//        if (retailAreaParam.getTeamBoxNum() < retailAreaParam.getSmallBoxNum()) {
+        if (retailAreaParam.getTeamBoxNum().compareTo(retailAreaParam.getSmallBoxNum()) < 0) {
             return AjaxResult.error("团队盒数需大于小区盒数");
         }
         //校验结算日期是否为空
@@ -146,7 +147,8 @@ public class CuMemberSpeRetailController extends BaseController {
                         continue;
                     }
                     //校验团队总盒数大于小区盒数
-                    if (cma.getTeamBoxNum() < cma.getSmallBoxNum()) {
+//                    if (cma.getTeamBoxNum() < cma.getSmallBoxNum()) {
+                    if (cma.getTeamBoxNum().compareTo(cma.getSmallBoxNum()) < 0) {
                         cma.setMsg("团队盒数需大于小区盒数");
                         errorlist.add(cma);
                         continue;
@@ -248,7 +250,8 @@ public class CuMemberSpeRetailController extends BaseController {
             return AjaxResult.error("会员信息不存在");
         }
         //校验团队总盒数大于小区盒数
-        if (retailAreaParam.getTeamBoxNum() < retailAreaParam.getSmallBoxNum()) {
+//        if (retailAreaParam.getTeamBoxNum() < retailAreaParam.getSmallBoxNum()) {
+        if (retailAreaParam.getTeamBoxNum().compareTo(retailAreaParam.getSmallBoxNum()) < 0) {
             return AjaxResult.error("团队盒数需大于小区盒数");
         }
         //校验结算日期是否为空
diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/RetailAreaParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/RetailAreaParam.java
index b727007b..5ba6f194 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/RetailAreaParam.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/RetailAreaParam.java
@@ -22,12 +22,12 @@ public class RetailAreaParam implements Serializable {
      * 团队总盒数
      */
     @Excel(name = "团队总盒数")
-    private Integer teamBoxNum = 0;
+    private BigDecimal teamBoxNum = BigDecimal.ZERO;
     /**
      * 小区盒数
      */
     @Excel(name = "小区盒数")
-    private Integer smallBoxNum = 0;
+    private BigDecimal smallBoxNum = BigDecimal.ZERO;
 
     /**
      * 结算日期
@@ -56,7 +56,7 @@ public class RetailAreaParam implements Serializable {
     /**
      * 个人消费盒数
      */
-    private Integer consumeBoxNum;
+    private BigDecimal consumeBoxNum;
 
     /**
      * 结算开始日期
diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberSpeRetail.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberSpeRetail.java
index 4368eb15..682db07d 100644
--- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberSpeRetail.java
+++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberSpeRetail.java
@@ -50,18 +50,18 @@ public class CuMemberSpeRetail extends BaseEntity {
      * 团队总盒数
      */
     @TableField("TEAM_BOX_NUM")
-    private Integer teamBoxNum;
+    private BigDecimal teamBoxNum;
 
     /**
      * 个人消费盒数
      */
     @TableField("CONSUME_BOX_NUM")
-    private Integer consumeBoxNum;
+    private BigDecimal consumeBoxNum;
     /**
      * 小区盒数
      */
     @TableField("SMALL_BOX_NUM")
-    private Integer smallBoxNum;
+    private BigDecimal smallBoxNum;
 
     /**
      * 团队总pv
diff --git a/sql/2025年6月30日-注水盒数小数位.sql b/sql/2025年6月30日-注水盒数小数位.sql
new file mode 100644
index 00000000..0f9f5597
--- /dev/null
+++ b/sql/2025年6月30日-注水盒数小数位.sql
@@ -0,0 +1,4 @@
+ALTER TABLE "RETAIL"."CU_MEMBER_SPE_RETAIL"
+MODIFY ("TEAM_BOX_NUM" NUMBER(10,2))
+MODIFY ("CONSUME_BOX_NUM" NUMBER(10,2))
+MODIFY ("SMALL_BOX_NUM" NUMBER(10,2))