门店批量导入修改

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

@@ -4,22 +4,22 @@ import java.io.Serializable;
 import java.util.List;
 
 public class StoreBulkOrderDTO implements Serializable {
-    private Integer type = 1; //1门店  2导购
-    private List<StoreOrderDTO> data;
+    private List<StoreOrderDTO> store;
+    private List<StoreOrderDTO> clerk;
 
-    public Integer getType() {
-        return type;
+    public List<StoreOrderDTO> getStore() {
+        return store;
     }
 
-    public void setType(Integer type) {
-        this.type = type;
+    public void setStore(List<StoreOrderDTO> store) {
+        this.store = store;
     }
 
-    public List<StoreOrderDTO> getData() {
-        return data;
+    public List<StoreOrderDTO> getClerk() {
+        return clerk;
     }
 
-    public void setData(List<StoreOrderDTO> data) {
-        this.data = data;
+    public void setClerk(List<StoreOrderDTO> clerk) {
+        this.clerk = clerk;
     }
 }

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

@@ -8,7 +8,8 @@ public class StoreOrderDTO implements Serializable {
     private Integer enterpriseId;
     private String storeCode;
     private String storeName;
-    private List<ClerkDTO> clerkList;
+    private String clerkName;
+    private String clerkCode;
 
     /********订单号或者会员卡号********/
     private String remark;
@@ -64,11 +65,19 @@ public class StoreOrderDTO implements Serializable {
         this.reason = reason;
     }
 
-    public List<ClerkDTO> getClerkList() {
-        return clerkList;
+    public String getClerkName() {
+        return clerkName;
     }
 
-    public void setClerkList(List<ClerkDTO> clerkList) {
-        this.clerkList = clerkList;
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
     }
 }

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

@@ -1001,9 +1001,9 @@ public class StoreApiServiceImpl implements StoreApiService {
     @Override
     public ServiceResponse<Void> saveStoreAndClerkForBulkOrder(String params) {
         logger.info("saveStoreAndClerkForBulkOrder:{}", params);
-        List<StoreOrderDTO> list = JSON.parseArray(params, StoreOrderDTO.class);
-        if(CollectionUtils.isNotEmpty(list)){
-            for(StoreOrderDTO storeOrderDTO : list){
+        StoreBulkOrderDTO storeBulkOrderDTO = JSON.parseObject(params, StoreBulkOrderDTO.class);
+        if(CollectionUtils.isNotEmpty(storeBulkOrderDTO.getStore())){
+            for(StoreOrderDTO storeOrderDTO : storeBulkOrderDTO.getStore()){
                 StoreDTO storeDTO = new StoreDTO();
                 storeDTO.setEnterpriseId(storeOrderDTO.getEnterpriseId());
                 storeDTO.setStoreCode(storeOrderDTO.getStoreCode());
@@ -1014,18 +1014,24 @@ public class StoreApiServiceImpl implements StoreApiService {
                 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(storeDTO.getStoreInfoId());
-                        clerkDTO.setReason(storeOrderDTO.getReason());
-                        clerkDTO.setRemark("订单号:" + storeOrderDTO.getRemark());
-                        clerkDTO.setStoreName(storeDTO.getStoreName());
-                        ServiceResponse serviceResponse = this.clerkApiService.saveOrUpdate(clerkDTO);
-                        logger.info("批量处理导购结果：{}", JSON.toJSONString(serviceResponse));
-                    }
+            }
+        }
+        if(CollectionUtils.isNotEmpty(storeBulkOrderDTO.getClerk())){
+            for(StoreOrderDTO storeOrderDTO : storeBulkOrderDTO.getClerk()){
+                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());
+                    clerkDTO.setEnterpriseId(storeOrderDTO.getEnterpriseId());
+                    clerkDTO.setStoreInfoId(store.getStoreInfoId());
+                    clerkDTO.setReason(storeOrderDTO.getReason());
+                    clerkDTO.setRemark("订单号:" + storeOrderDTO.getRemark());
+                    clerkDTO.setStoreName(store.getStoreName());
+                    ServiceResponse serviceResponse = this.clerkApiService.saveOrUpdate(clerkDTO);
+                    logger.info("批量处理导购结果：{}", JSON.toJSONString(serviceResponse));
                 }
             }
         }