门店批量导入修改

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

 package com.gic.store.dto;
 
 import java.io.Serializable;
+import java.util.List;
 
 public class StoreOrderDTO implements Serializable {
     private Integer regionId;
     private Integer enterpriseId;
     private String storeCode;
     private String storeName;
-    private String clerkCode;
-    private String clerkName;
+    private List<ClerkDTO> clerkList;
 
     /********订单号或者会员卡号********/
     private String remark;
@@ -47,21 +47,6 @@ public class StoreOrderDTO implements Serializable {
         this.storeName = storeName;
     }
 
-    public String getClerkCode() {
-        return clerkCode;
-    }
-
-    public void setClerkCode(String clerkCode) {
-        this.clerkCode = clerkCode;
-    }
-
-    public String getClerkName() {
-        return clerkName;
-    }
-
-    public void setClerkName(String clerkName) {
-        this.clerkName = clerkName;
-    }
 
     public String getRemark() {
         return remark;
@@ -78,4 +63,12 @@ public class StoreOrderDTO implements Serializable {
     public void setReason(Integer reason) {
         this.reason = reason;
     }
+
+    public List<ClerkDTO> getClerkList() {
+        return clerkList;
+    }
+
+    public void setClerkList(List<ClerkDTO> clerkList) {
+        this.clerkList = clerkList;
+    }
 }

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

@@ -1001,44 +1001,35 @@ public class StoreApiServiceImpl implements StoreApiService {
     @Override
     public ServiceResponse<Void> saveStoreAndClerkForBulkOrder(String params) {
         logger.info("saveStoreAndClerkForBulkOrder:{}", params);
-        StoreBulkOrderDTO dto = JSON.parseObject(params, StoreBulkOrderDTO.class);
-        List<StoreOrderDTO> data = dto.getData();
-        if(CollectionUtils.isNotEmpty(data)){
-            if(dto.getType() == 1){ //门店
-                for(StoreOrderDTO storeOrderDTO : data){
-                    StoreDTO storeDTO = new StoreDTO();
-                    storeDTO.setEnterpriseId(storeOrderDTO.getEnterpriseId());
-                    storeDTO.setStoreCode(storeOrderDTO.getStoreCode());
-                    storeDTO.setStoreName(storeOrderDTO.getStoreName());
-                    storeDTO.setRegionId(storeOrderDTO.getRegionId());
-                    storeDTO.setReason(storeOrderDTO.getReason());
-                    storeDTO.setRemark(storeOrderDTO.getRemark());
-                    storeDTO.setCreateType(storeOrderDTO.getReason());
-                    ServiceResponse<StoreDTO> response = this.saveOrUpdate(storeDTO);
-                    logger.info("批量处理门店结果：{}", JSON.toJSONString(response));
-                }
-            }
-            if(dto.getType() == 2){ //导购
-                for(StoreOrderDTO storeOrderDTO : data){
-                    ServiceResponse<StoreDTO> storeResponse = this.getStoreByStoreCode(storeOrderDTO.getEnterpriseId(),
-                            storeOrderDTO.getRegionId(), storeOrderDTO.getStoreCode());
-                    if(storeResponse.isSuccess() && storeResponse.getResult() != null){
-                        StoreDTO store = storeResponse.getResult();
-                        ClerkDTO clerkDTO = new ClerkDTO();
-                        clerkDTO.setClerkName(storeOrderDTO.getClerkName());
-                        clerkDTO.setClerkCode(storeOrderDTO.getClerkCode());
+        List<StoreOrderDTO> list = JSON.parseArray(params, StoreOrderDTO.class);
+        if(CollectionUtils.isNotEmpty(list)){
+            for(StoreOrderDTO storeOrderDTO : list){
+                StoreDTO storeDTO = new StoreDTO();
+                storeDTO.setEnterpriseId(storeOrderDTO.getEnterpriseId());
+                storeDTO.setStoreCode(storeOrderDTO.getStoreCode());
+                storeDTO.setStoreName(storeOrderDTO.getStoreName());
+                storeDTO.setRegionId(storeOrderDTO.getRegionId());
+                storeDTO.setReason(storeOrderDTO.getReason());
+                storeDTO.setRemark(storeOrderDTO.getRemark());
+                storeDTO.setCreateType(storeOrderDTO.getReason());
+                ServiceResponse<StoreDTO> response = this.saveOrUpdate(storeDTO);
+                logger.info("批量处理门店结果：{}", JSON.toJSONString(response));
+                if(CollectionUtils.isNotEmpty(storeOrderDTO.getClerkList())){
+                    for(ClerkDTO clerkDTO : storeOrderDTO.getClerkList()){
+                        clerkDTO.setClerkName(clerkDTO.getClerkName());
+                        clerkDTO.setClerkCode(clerkDTO.getClerkCode());
                         clerkDTO.setEnterpriseId(storeOrderDTO.getEnterpriseId());
-                        clerkDTO.setStoreInfoId(store.getStoreInfoId());
+                        clerkDTO.setStoreInfoId(storeDTO.getStoreInfoId());
                         clerkDTO.setReason(storeOrderDTO.getReason());
                         clerkDTO.setRemark("订单号:" + storeOrderDTO.getRemark());
-                        clerkDTO.setStoreName(store.getStoreName());
+                        clerkDTO.setStoreName(storeDTO.getStoreName());
                         ServiceResponse serviceResponse = this.clerkApiService.saveOrUpdate(clerkDTO);
                         logger.info("批量处理导购结果：{}", JSON.toJSONString(serviceResponse));
                     }
                 }
             }
         }
-        return null;
+        return ServiceResponse.success();
     }
 
     @Override