增加提示

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

@@ -399,7 +399,10 @@ public class StoreController extends DownloadUtils {
                 return RestResponse.failure(ErrorCode.OPERATION_FAILED.getCode(), "请其他门店会员转移完毕后再试");
             }
         }
-
+        StoreDTO storeDTO = storeApiService.getStoreById(UserDetailUtils.getUserDetail().getEnterpriseId(), memberTransStoreId).getResult();
+        if (StringUtils.isNotBlank(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) {
@@ -407,7 +410,7 @@ public class StoreController extends DownloadUtils {
                 ServiceResponse<Void> serviceResponse = storeTransferApiService.save(UserDetailUtils.getUserDetail().getEnterpriseId(), storeIds, toStoreId);
             }
             ServiceResponse<Boolean> serviceResponse = tranMemberStore(storeIds, memberTransStoreId, memberTransType);
-            if (!serviceResponse.isSuccess()) {
+            if (serviceResponse != null && !serviceResponse.isSuccess()) {
                 logger.warn("转移会员失败:{}", serviceResponse.getMessage());
             }
             // 写日志
@@ -450,7 +453,11 @@ 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.isNotBlank(storeDTO.getBrandIds())) {
+                return ServiceResponse.failure(ErrorCode.UNKNOWN_ERROR.getCode(), "该门店无店招品牌信息，请完善后再执行此操作");
+            }
+            Integer storeInfoId = storeDTO.getStoreInfoId();
             List<Integer> storeInfoIdList = storeInfoList.stream().map(StoreInfoDTO::getStoreInfoId).collect(Collectors.toList());
             ServiceResponse<Boolean> serviceResponse = userOwnerApiService.transferStore(UserDetailUtils.getUserDetail().getEnterpriseId(), storeInfoIdList, storeInfoId, memberTransType);
             return serviceResponse;
@@ -651,7 +658,7 @@ public class StoreController extends DownloadUtils {
             return RestResponse.failure(ErrorCode.OPERATION_FAILED.getCode(), "请其他门店会员转移完毕后再试");
         }
         ServiceResponse<Boolean> serviceResponse = tranMemberStore(storeId, toStoreId, memberTransType);
-        if (!serviceResponse.isSuccess()) {
+        if (serviceResponse != null && !serviceResponse.isSuccess()) {
             return EnterpriseRestResponse.failure(ErrorCode.UNKNOWN_ERROR.getCode(), serviceResponse.getMessage());
         }
         cacheMap.put(UserDetailUtils.getUserDetail().getEnterpriseId(), storeId);