Merge branch 'cc_20250514_approve_notice' into 'master'

Cc 20250514 approve notice

See merge request hangzhou/java/custom_zxjp!81

coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java

@@ -60,6 +60,8 @@ public enum UserRoleEnum {
     HEAD_OF_DESIGN(450000000L,"设计组长"),
 
     QUOTATION_OFFICE(470000000L,"报价员"),
+
+    OWN_SHOP_OFFICE(480000000L,"自有店财务"),
     ;
 
     private Long code;

coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java

@@ -95,7 +95,7 @@ public enum ShopSubStageStatusEnum {
     SHOP_SUB_STAGE_STATUS_163(ShopSubStageEnum.SHOP_STAGE_16, 1630, "已完成", Boolean.TRUE),
 
     //订货系统
-    SHOP_SUB_STAGE_STATUS_170(ShopSubStageEnum.SHOP_STAGE_17, 1700, "待【信息部】提交", Boolean.FALSE),
+    SHOP_SUB_STAGE_STATUS_170(ShopSubStageEnum.SHOP_STAGE_17, 1700, "待【IT部】提交", Boolean.FALSE),
     SHOP_SUB_STAGE_STATUS_173(ShopSubStageEnum.SHOP_STAGE_17, 1730, "已完成", Boolean.TRUE),
 
     //抖音
@@ -132,11 +132,11 @@ public enum ShopSubStageStatusEnum {
 
 
     //信发系统开通
-    SHOP_SUB_STAGE_STATUS_230(ShopSubStageEnum.SHOP_STAGE_23, 2300, "待【信息部】提交", Boolean.FALSE),
+    SHOP_SUB_STAGE_STATUS_230(ShopSubStageEnum.SHOP_STAGE_23, 2300, "待【火码】提交", Boolean.FALSE),
     SHOP_SUB_STAGE_STATUS_235(ShopSubStageEnum.SHOP_STAGE_23, 2350, "已完成", Boolean.TRUE),
 
     //营帐通开通
-    SHOP_SUB_STAGE_STATUS_240(ShopSubStageEnum.SHOP_STAGE_24, 2400, "待【信息部】提交", Boolean.FALSE),
+    SHOP_SUB_STAGE_STATUS_240(ShopSubStageEnum.SHOP_STAGE_24, 2400, "待【火码】提交", Boolean.FALSE),
     SHOP_SUB_STAGE_STATUS_244(ShopSubStageEnum.SHOP_STAGE_24, 2440, "无需开通", Boolean.TRUE),
     SHOP_SUB_STAGE_STATUS_245(ShopSubStageEnum.SHOP_STAGE_24, 2450, "已完成", Boolean.TRUE),
 

coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java

@@ -1,7 +1,9 @@
 package com.cool.store.request;
 
 import com.cool.store.entity.OrderSysInfoDO;
+import com.cool.store.enums.JoinModeEnum;
 import com.cool.store.enums.OrderSysTypeEnum;
+import com.cool.store.enums.SignTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
@@ -115,13 +117,17 @@ public class OrderSysInfoRequest {
       
         return orderSysInfoDO;
     }
-    public Boolean check(){
+    public Boolean check(Integer joinMode){
         if (Objects.equals(this.type, OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType())){
             if (StringUtils.isAnyBlank(this.xgjRegionId,this.xgjVicePresident,this.declareGoodsDate,this.declareGoodsLogisticsWarehouse,this.declareGoodsType)){
                 return false;
             }
         }
         if (Objects.equals(this.type, OrderSysTypeEnum.ORDER_SYS_TYPE_2.getType())){
+            //自由店只需要门店编码
+            if (Objects.equals(joinMode, JoinModeEnum.OWN_STORE.getCode())&&this.shopCode!=null){
+                return true;
+            }
             if (StringUtils.isAnyBlank(this.receivingFirmName,this.receivingMsBankAccount,this.receivingMsBankBranch,this.bankUnionPayAccount,this.shopCode)){
                 return false;
             }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java

@@ -9,10 +9,12 @@ import com.cool.store.enums.point.ShopSubStageEnum;
 import com.cool.store.enums.point.ShopSubStageStatusEnum;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.mapper.FranchiseFeeMapper;
+import com.cool.store.mapper.SignFranchiseMapper;
 import com.cool.store.request.AuditRequest;
 import com.cool.store.request.OrderSysInfoRequest;
 import com.cool.store.service.OperationLogService;
 import com.cool.store.service.OrderSysInfoService;
+import com.cool.store.service.SignFranchiseService;
 import com.cool.store.service.UserAuthMappingService;
 import com.cool.store.utils.poi.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
@@ -73,7 +75,8 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
         String curUserId = user.getUserId();
         String curName = user.getName();
         //参数校验
-        if (!request.check()) {
+        ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId());
+        if (!request.check(shopInfo.getJoinMode())) {
             throw new ServiceException(ErrorCodeEnum.THE_DATA_IS_NOT_FILLED);
         }
         OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(request.getShopId());
@@ -105,7 +108,12 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
                 map.put("partnerUsername", lineInfoDO.getUsername());
                 map.put("partnerMobile", lineInfoDO.getMobile());
                 map.put("storeName", shopInfoDO.getShopName());
-                List<EnterpriseUserDO> itList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.FINANCE, shopInfoDO.getRegionId());
+                //自有店财务
+                UserRoleEnum finance = UserRoleEnum.FINANCE;
+                if (JoinModeEnum.OWN_STORE.equals(shopInfo.getJoinMode())){
+                    finance = UserRoleEnum.OWN_SHOP_OFFICE;
+                }
+                List<EnterpriseUserDO> itList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(finance, shopInfoDO.getRegionId());
                 List<String> itUsers = new ArrayList<>();
                 if (Objects.nonNull(itList)) {
                     itUsers.addAll(itList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));