门店ETL修改

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

@@ -36,6 +36,10 @@ public class ProcessBatchStoreDTO implements Serializable {
     private String conactsPhone;
 
     /**
+     * 店招品牌id
+     */
+    private Integer brandId;
+    /**
      * 店招品牌
      */
     private String brandName;
@@ -209,4 +213,12 @@ public class ProcessBatchStoreDTO implements Serializable {
     public void setStoreGroupName(String storeGroupName) {
         this.storeGroupName = storeGroupName;
     }
+
+    public Integer getBrandId() {
+        return brandId;
+    }
+
+    public void setBrandId(Integer brandId) {
+        this.brandId = brandId;
+    }
 }

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

@@ -647,13 +647,22 @@ public class StoreApiServiceImpl implements StoreApiService {
             return responseErrorElement(ImportStoreBatchResultEnum.A4);
         }
         storeDTO.setStoreCode(processBatchStoreDTO.getStoreCode());
-        if (StringUtils.isNotBlank(processBatchStoreDTO.getBrandName())) {
+
+        // 店招品牌
+        if (processBatchStoreDTO.getBrandId() != null) {
+            TabStoreBrand storeBrand = storeBrandService.getById(processBatchStoreDTO.getBrandId());
+            if (storeBrand == null) {
+                return responseErrorElement(ImportStoreBatchResultEnum.B1);
+            }
+            storeDTO.setBrandIds(processBatchStoreDTO.getBrandId().toString());
+        }else if (StringUtils.isNotBlank(processBatchStoreDTO.getBrandName())) {
             TabStoreBrand storeBrand = storeBrandService.getByStoreBrandName(processBatchStoreDTO.getEnterpriseId(), processBatchStoreDTO.getBrandName());
             if (storeBrand == null) {
                 return responseErrorElement(ImportStoreBatchResultEnum.B1);
             }
             storeDTO.setBrandIds(storeBrand.getStoreBrandId().toString());
         }
+        // 门店类型
         if (StringUtils.isNotBlank(processBatchStoreDTO.getStoreType())) {
             ServiceResponse<List<StoreDictDTO>> serviceResponse = storeDictApiService.listStoreType(processBatchStoreDTO.getEnterpriseId());
             if (serviceResponse.isSuccess()) {