## Feat - 收益区域&配送中心

bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/manage/CuMemberRetailRegionController.java

@@ -148,6 +148,7 @@ public class CuMemberRetailRegionController extends BaseController {
         checkMrrExt.setEffective(EDealerYesNo.YES.getValue());
         checkMrrExt.setPkCountry(pkCountry);
         checkMrrExt.setSystemType(systemType);
+        checkMrrExt.setBusinessType(2);
         List<CuMemberRetailRegionExt> list = cuMemberRetailRegionService.memberretailRegList(checkMrrExt);
         if (CollectionUtil.isNotEmpty(list)) {
             return AjaxResult.error(ConfigMsgConstants.MEMBER_RETAIL_REGION_REPEAT);
@@ -162,6 +163,7 @@ public class CuMemberRetailRegionController extends BaseController {
                 .eq(CuMemberRetailRegion::getCounty, mrrExt.getCounty())
                 .eq(CuMemberRetailRegion::getEffective, EYesNo.YES.getIntValue())
                 .eq(CuMemberRetailRegion::getSystemType, systemType)
+                .eq(CuMemberRetailRegion::getBusinessType, 2)
         );
         if (cuMemberRetailRegion > 0) {
             return AjaxResult.error("当前区域已经被占用");
@@ -205,6 +207,7 @@ public class CuMemberRetailRegionController extends BaseController {
                 .eq(CuMemberRetailRegion::getCounty, mrrExt.getCounty())
                 .eq(CuMemberRetailRegion::getEffective, EYesNo.YES.getIntValue())
                 .eq(CuMemberRetailRegion::getSystemType, SecurityUtils.getSystemType())
+                .eq(CuMemberRetailRegion::getBusinessType, 2)
                 .ne(CuMemberRetailRegion::getPkId, mrrExt.getPkId())
         );
         if (cuMemberRetailRegion > 0) {

bd-business/bd-business-member/src/main/java/com/hzs/retail/member/param/RetailMemberRegionParam.java

@@ -63,4 +63,9 @@ public class RetailMemberRegionParam implements Serializable {
      */
     private Integer systemType;
 
+    /**
+     * 业务类型(1-区域选择,2-配送中心)
+     */
+    private Integer businessType;
+
 }

bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailRegionMapper.xml

@@ -45,7 +45,9 @@
             source,
             creation_time,
             pk_creator,
-            system_type)
+            system_type,
+            business_type
+            )
         select cu_member_retail_region_seq.nextval,
                #{retailRegion.pkMember},
                #{retailRegion.province},
@@ -54,7 +56,8 @@
                #{retailRegion.source},
                sysdate,
                #{retailRegion.pkCreator},
-               #{retailRegion.systemType}
+               #{retailRegion.systemType},
+               2
         from dual
         where not exists(select 1
                          from cu_member_retail_region cmrr
@@ -63,7 +66,9 @@
                            and cmrr.county = #{retailRegion.county}
                            and cmrr.del_flag = 0
                            and cmrr.effective = 0
-                           and cmrr.system_type = #{retailRegion.systemType})
+                           and cmrr.system_type = #{retailRegion.systemType}
+                           and cmrr.business_type = 2
+                         )
     </insert>
 
     <!--    未绑定收益区域-->
@@ -164,6 +169,9 @@
         <if test="source!=null">
             and CRR.source=#{source}
         </if>
+        <if test="businessType != null">
+            and CRR.BUSINESS_TYPE = #{businessType}
+        </if>
         order by CRR.CREATION_TIME desc
     </select>
 

bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java

@@ -222,10 +222,10 @@ public class ApiRetailOrderController {
         }
 
         // 校验会员选择区域是否已经被占用
-        checkStr = this.checkRegionNum(registerParam);
+//        checkStr = this.checkRegionNum(registerParam);
-        if (null != checkStr) {
+//        if (null != checkStr) {
-            return AjaxResult.error(checkStr);
+//            return AjaxResult.error(checkStr);
-        }
+//        }
 
         // 手机号可以重复，不需要进行是否重复校验 -- 已经跳过，此处可以不需要当前判断
 //        // 校验注册关系（是否跨团队） -- 2024.12.24 修改为校验手机号必须唯一

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/retail/member/CuMemberRetailRegion.java

@@ -83,4 +83,10 @@ public class CuMemberRetailRegion extends BaseEntity {
     @TableField("SYSTEM_TYPE")
     private Integer systemType;
 
+    /**
+     * 业务类型(1-区域选择,2-配送中心)
+     */
+    @TableField("BUSINESS_TYPE")
+    private Integer businessType;
+
 }

sql/2025年8月12日_选择区域&配送中心.sql

@@ -0,0 +1,5 @@
+ALTER TABLE "CU_MEMBER_RETAIL_REGION"
+    MODIFY ("EFFECTIVE_END_DATE"  DEFAULT TO_DATE('2099-01-01', 'YYYY-MM-DD'))
+    ADD ("BUSINESS_TYPE" NUMBER(1,0) DEFAULT 1 NOT NULL);
+
+COMMENT ON COLUMN "CU_MEMBER_RETAIL_REGION"."BUSINESS_TYPE" IS '业务类型(1-区域选择,2-配送中心)'