feat:pos pos 建店 不依赖营业证照

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

@@ -69,7 +69,8 @@ public enum UserRoleEnum {
 
     JING_DONG_OPERATIONS_CUSTOMER(500000000L,"京东运营大区客服"),
     JING_DONG_HEADQUARTERS_BUILD_CUSTOMER(510000000L,"京东总部建店客服"),
-    FRANCHISEES(530000000L,"加盟商")
+    FRANCHISEES(530000000L,"加盟商"),
+    SERVICE_PACKAGE_DEDICATED(1725431698852L,"服务包专用"),
     ;
 
     private Long code;

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

@@ -1,6 +1,7 @@
 package com.cool.store.service.impl;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.cool.store.dao.*;
 import com.cool.store.entity.LineInfoDO;
 import com.cool.store.entity.PosAndOrderInfoDO;
@@ -16,6 +17,7 @@ import com.cool.store.response.PosAndOrderResponse;
 import com.cool.store.service.PosAndOrderInfoService;
 import com.cool.store.mapper.PosAndOrderInfoMapper;
 import com.cool.store.service.PreparationService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +32,7 @@ import java.util.Objects;
  * @createDate 2024-10-09 14:39:11
  */
 @Service
+@Slf4j
 public class PosAndOrderInfoServiceImpl implements PosAndOrderInfoService {
     @Resource
     private LineInfoDAO lineInfoDAO;
@@ -46,6 +49,7 @@ public class PosAndOrderInfoServiceImpl implements PosAndOrderInfoService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer submitOrUpdate(PostAndOrderRequest request, String user) {
+        log.info("PosAndOrderInfoService_submitOrUpdate:{}", JSONObject.toJSONString(request));
         PosAndOrderInfoDO posAndOrderInfoDO = posAndOrderInfoDAO.selectOneByShopId(request.getShopId(), request.getType());
         PosAndOrderInfoDO posAndOrderInfo = request.toDO();
         posAndOrderInfo.setCreateUser(user);

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

@@ -220,6 +220,7 @@ public class PreparationServiceImpl implements PreparationService {
                     equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus());
             if (flag3) {
                 List<ShopSubStageStatusEnum> list = new ArrayList<>();
+                list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160);
                 list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170);
                 list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_230);
                 shopStageInfoDAO.batchUpdateShopStageStatus(shopId, list);
@@ -238,7 +239,6 @@ public class PreparationServiceImpl implements PreparationService {
                     equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage()).getShopSubStageStatus());
             if (flag1 && flag2) {
                 List<ShopSubStageStatusEnum> list = new ArrayList<>();
-                list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160);
                 list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_240);
                 shopStageInfoDAO.batchUpdateShopStageStatus(shopId, list);
             }
@@ -361,12 +361,10 @@ public class PreparationServiceImpl implements PreparationService {
                     equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_1.getShopSubStage()).getShopSubStageStatus());
             Boolean flag3 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156.getShopSubStageStatus().
                     equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus());
-            Boolean flag4 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33.getShopSubStageStatus().
-                    equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage()).getShopSubStageStatus());
 
-            log.info("selectSiteAndBuildStoreComplete  flag2->{} flag3->{} flag4->{}",flag2,flag3, flag4);
+            log.info("selectSiteAndBuildStoreComplete  flag2->{} flag3->{} flag4->{}",flag2,flag3);
             //都完成了 状态修改
-            if (flag2 && flag3 && flag4) {
+            if (flag2 && flag3) {
                 shopAccountDAO.updateStatusByShopIdAndSystemName(shopId,  Arrays.asList(ShopAccountEnum.HUOMA.getSystemName()), OpenStatusEnum.OPENSTATUSENUM_2.getCode(),null,null);
             }
         }

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

@@ -203,6 +203,7 @@ public class PushServiceImpl implements PushService {
             //如果userRoleIds包含督导。大区总。分部负责人任何一个 使用当前门店的手机号
             if (userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode()) ||
                     userRoleIds.contains(UserRoleEnum.HEAD_OF_DIVISION.getCode()) ||
+                    userRoleIds.contains(UserRoleEnum.SERVICE_PACKAGE_DEDICATED.getCode()) ||
                     userRoleIds.contains(UserRoleEnum.REGION_MANAGER.getCode())) {
                 StoreDO store = storeDao.getByStoreNum(dto.getShopCode());
                 if (store != null&&store.getTelephone()!=null){

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

@@ -131,6 +131,7 @@ public class StoreServiceImpl implements StoreService {
             List<SysRoleDO> sysRoleDOS = roleIds.stream().filter(role -> "store_inside".equals(role.getPositionType())
                     ||UserRoleEnum.SUPERVISION.getCode().equals(role.getId())
                     ||UserRoleEnum.HEAD_OF_DIVISION.getCode().equals(role.getId())
+                    ||UserRoleEnum.SERVICE_PACKAGE_DEDICATED.getCode().equals(role.getId())
                     ||UserRoleEnum.REGION_MANAGER.getCode().equals(role.getId())).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(sysRoleDOS)){
                 //获取用户管辖区域