Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-api/src/main/java/com/gic/store/dto/StoreFieldRegionRelDTO.java

@@ -31,7 +31,7 @@ public class StoreFieldRegionRelDTO implements Serializable{
     /**
      *
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      *
@@ -67,12 +67,12 @@ public class StoreFieldRegionRelDTO implements Serializable{
         this.storeFieldId = storeFieldId;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {
@@ -97,7 +97,7 @@ public class StoreFieldRegionRelDTO implements Serializable{
                 "fieldRegionId=" + fieldRegionId +
                 ", regionId=" + regionId +
                 ", storeFieldId=" + storeFieldId +
-                ", status=" + status +
+                ", status=" + deleteFlag +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 '}';

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreFieldApiServiceImpl.java

@@ -102,7 +102,7 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
             StoreFieldRegionRelDTO fieldRegionRelDTO = new StoreFieldRegionRelDTO();
             fieldRegionRelDTO.setCreateTime(now);
             fieldRegionRelDTO.setUpdateTime(now);
-            fieldRegionRelDTO.setStatus(1);
+            fieldRegionRelDTO.setDeleteFlag(0);
             fieldRegionRelDTO.setRegionId(Integer.parseInt(regionId));
             fieldRegionRelDTO.setStoreFieldId(storeFieldId);
             regionRelDTOList.add(fieldRegionRelDTO);
@@ -269,7 +269,7 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
             StoreFieldRegionRelDTO fieldRegionRelDTO = new StoreFieldRegionRelDTO();
             fieldRegionRelDTO.setCreateTime(now);
             fieldRegionRelDTO.setUpdateTime(now);
-            fieldRegionRelDTO.setStatus(1);
+            fieldRegionRelDTO.setDeleteFlag(0);
             fieldRegionRelDTO.setRegionId(Integer.parseInt(regionId));
             fieldRegionRelDTO.setStoreFieldId(storeFieldDTO.getStoreFieldId());
             regionRelDTOList.add(fieldRegionRelDTO);

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreGroupApiServiceImpl.java

@@ -148,7 +148,7 @@ public class StoreGroupApiServiceImpl implements StoreGroupApiService {
                 storeGroupService.update(tabStoreGroup);
 
                 //如果上级分组有门店，则新建一个未分组数据，然后把所有门店放进去
-                if (isNeedTransferStore(storeGroupParentId)) {
+                if (isNeedTransferStoreWhenNew(storeGroupParentId)) {
                     StoreGroupDTO noStoreGroup = new StoreGroupDTO();
                     noStoreGroup.setEnterpriseId(storeGroupDTO.getEnterpriseId());
                     noStoreGroup.setGroupLevel(oldStoreGroup.getGroupLevel());

gic-store-web/src/main/java/com/gic/store/web/controller/ClerkImportController.java

@@ -103,6 +103,7 @@ public class ClerkImportController {
      * @throws IOException
      */
     @RequestMapping("/clerk-tmp-file-upload")
+    @HeaderSignIgnore
     public RestResponse fileUpload(HttpServletRequest request, MultipartFile file, PageQO pageQO) throws IOException {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         if (file == null || file.isEmpty()) {

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -399,14 +399,20 @@ public class StoreController extends DownloadUtils {
                 return RestResponse.failure(ErrorCode.OPERATION_FAILED.getCode(), "请其他门店会员转移完毕后再试");
             }
         }
-
+        StoreDTO storeDTO = storeApiService.getStoreById(UserDetailUtils.getUserDetail().getEnterpriseId(), memberTransStoreId).getResult();
+        if (StringUtils.isBlank(storeDTO.getBrandIds())) {
+            return RestResponse.failure(ErrorCode.UNKNOWN_ERROR.getCode(), "该门店无店招品牌信息，请完善后再执行此操作");
+        }
         ServiceResponse response = this.storeApiService.bulkUpdateStore(storeIds, value, enterpriseId, type, UserDetailUtils.getUserDetail().getUserId(), UserDetailUtils.getUserDetail().getUserInfo().getUserName());
         if (response.isSuccess()) {
             if (type == 1 && toStoreId != null) {
                 // 如果是批量修改状态 要转移门店
                 ServiceResponse<Void> serviceResponse = storeTransferApiService.save(UserDetailUtils.getUserDetail().getEnterpriseId(), storeIds, toStoreId);
             }
-            tranMemberStore(storeIds, memberTransStoreId, memberTransType);
+            ServiceResponse<Boolean> serviceResponse = tranMemberStore(storeIds, memberTransStoreId, memberTransType);
+            if (serviceResponse != null && !serviceResponse.isSuccess()) {
+                logger.warn("转移会员失败:{}", serviceResponse.getMessage());
+            }
             // 写日志
             String[] storeArr = storeIds.split(",");
             StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
@@ -436,7 +442,7 @@ public class StoreController extends DownloadUtils {
         return EnterpriseRestResponse.failure(response);
     }
 
-    private void tranMemberStore(String storeIds, Integer memberTransStoreId, Integer memberTransType) {
+    private ServiceResponse<Boolean> tranMemberStore(String storeIds, Integer memberTransStoreId, Integer memberTransType) {
         if (memberTransStoreId != null && memberTransType != null) {
             List<StoreDTO> storeInfoList;
             StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
@@ -447,10 +453,16 @@ public class StoreController extends DownloadUtils {
                 storeSearchDTO.setStoreIds(storeIds.replace(',', ' '));
                 storeInfoList = this.storeApiService.listStore(storeSearchDTO, 1, storeIds.split(" ").length, "storeInfoId").getResult().getResult();
             }
-            Integer storeInfoId = storeApiService.getStoreById(UserDetailUtils.getUserDetail().getEnterpriseId(), memberTransStoreId).getResult().getStoreInfoId();
+            StoreDTO storeDTO = storeApiService.getStoreById(UserDetailUtils.getUserDetail().getEnterpriseId(), memberTransStoreId).getResult();
+            if (StringUtils.isBlank(storeDTO.getBrandIds())) {
+                return ServiceResponse.failure(ErrorCode.UNKNOWN_ERROR.getCode(), "该门店无店招品牌信息，请完善后再执行此操作");
+            }
+            Integer storeInfoId = storeDTO.getStoreInfoId();
             List<Integer> storeInfoIdList = storeInfoList.stream().map(StoreInfoDTO::getStoreInfoId).collect(Collectors.toList());
-            userOwnerApiService.transferStore(UserDetailUtils.getUserDetail().getEnterpriseId(), storeInfoIdList, storeInfoId, memberTransType);
+            ServiceResponse<Boolean> serviceResponse = userOwnerApiService.transferStore(UserDetailUtils.getUserDetail().getEnterpriseId(), storeInfoIdList, storeInfoId, memberTransType);
+            return serviceResponse;
         }
+        return null;
     }
 
     @RequestMapping("list-store-export-field")
@@ -645,7 +657,10 @@ public class StoreController extends DownloadUtils {
         if (StringUtils.isNotBlank(cacheStoreId)) {
             return RestResponse.failure(ErrorCode.OPERATION_FAILED.getCode(), "请其他门店会员转移完毕后再试");
         }
-        tranMemberStore(storeId, toStoreId, memberTransType);
+        ServiceResponse<Boolean> serviceResponse = tranMemberStore(storeId, toStoreId, memberTransType);
+        if (serviceResponse != null && !serviceResponse.isSuccess()) {
+            return EnterpriseRestResponse.failure(ErrorCode.UNKNOWN_ERROR.getCode(), serviceResponse.getMessage());
+        }
         cacheMap.put(UserDetailUtils.getUserDetail().getEnterpriseId(), storeId);
         String[] split = storeId.split(",");
         for (String store : split) {

gic-store-web/src/main/java/com/gic/store/web/controller/StoreImportController.java

@@ -116,6 +116,7 @@ public class StoreImportController {
      * @throws IOException
      */
     @RequestMapping("/store-tmp-file-upload")
+    @HeaderSignIgnore
     public RestResponse fileUpload(HttpServletRequest request, MultipartFile file, PageQO pageQO) throws IOException {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         if (file == null || file.isEmpty()) {