Merge remote-tracking branch 'origin/developer' into developer

gic-store-api/src/main/java/com/gic/store/service/StoreDictApiService.java

@@ -63,5 +63,5 @@ public interface StoreDictApiService {
      * @param value
      * @return
      */
-    ServiceResponse saveStoreField(Integer enterpriseId, String value);
+    ServiceResponse saveStoreField(Integer enterpriseId, String value, int type);
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreDictMapper.java

 package com.gic.store.dao.mapper;
 
 import com.gic.store.entity.TabStoreDict;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -63,4 +64,6 @@ public interface TabStoreDictMapper {
     List<String> listStoreStatus(Integer enterpriseId);
 
     List<String> listStoreField(Integer enterpriseId);
+
+    void deleteStoreField(@Param("enterpriseId") Integer enterpriseId, @Param("value")String value);
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/service/StoreDictService.java

@@ -39,4 +39,6 @@ public interface StoreDictService {
     List<String> listStoreField(Integer enterpriseId);
 
     void saveStoreField(TabStoreDict tabStoreDict);
+
+    void deleteStoreField(Integer enterpriseId, String value);
 }

gic-store-service/src/main/java/com/gic/store/service/impl/StoreDictServiceImpl.java

@@ -44,4 +44,9 @@ public class StoreDictServiceImpl implements StoreDictService {
         tabStoreDict.setType("storeField");
         this.tabStoreDictMapper.insert(tabStoreDict);
     }
+
+    @Override
+    public void deleteStoreField(Integer enterpriseId, String value) {
+        this.tabStoreDictMapper.deleteStoreField(enterpriseId, value);
+    }
 }

gic-store-service/src/main/java/com/gic/store/service/outer/StoreDictApiServiceImpl.java

@@ -119,18 +119,22 @@ public class StoreDictApiServiceImpl implements StoreDictApiService {
     }
 
     @Override
-    public ServiceResponse saveStoreField(Integer enterpriseId, String value) {
-        List<String> list = this.storeDictService.listStoreField(enterpriseId);
-        for(String s : list){
-            if(s.equals(value)){
-                return ServiceResponse.failure(ErrorCode.ERR_6.getCode(), ErrorCode.ERR_6.getMsg());
+    public ServiceResponse saveStoreField(Integer enterpriseId, String value, int type) {
+        if(type == 1){ //新增
+            List<String> list = this.storeDictService.listStoreField(enterpriseId);
+            for(String s : list){
+                if(s.equals(value)){
+                    return ServiceResponse.failure(ErrorCode.ERR_6.getCode(), ErrorCode.ERR_6.getMsg());
+                }
             }
+            TabStoreDict tabStoreDict = new TabStoreDict();
+            tabStoreDict.setEnterpriseId(enterpriseId);
+            tabStoreDict.setCreateTime(new Date());
+            tabStoreDict.setValue(value);
+            this.storeDictService.saveStoreField(tabStoreDict);
+        }else {
+            this.storeDictService.deleteStoreField(enterpriseId, value);
         }
-        TabStoreDict tabStoreDict = new TabStoreDict();
-        tabStoreDict.setEnterpriseId(enterpriseId);
-        tabStoreDict.setCreateTime(new Date());
-        tabStoreDict.setValue(value);
-        this.storeDictService.saveStoreField(tabStoreDict);
         return ServiceResponse.success();
     }
 

gic-store-service/src/main/java/com/gic/store/service/outer/StoreTaskServiceImpl.java

@@ -2,6 +2,7 @@ package com.gic.store.service.outer;
 
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GlobalInfo;
 import com.gic.store.constant.Constants;
 import com.gic.store.constant.CreateTypeEnum;
@@ -58,21 +59,18 @@ public class StoreTaskServiceImpl extends AbstractTaskAllocationOperation implem
 
     @Override
     public List<Object> getListTasks(String params) {
-        // TODO
         List<TabStoreTmp> list = storeImportService.listUnImportStore(params);
-        List<Object> listTask = new ArrayList<Object>(list);
         logger.info("门店批量导入放入队列数据数量：{}", list.size());
+        List listTask = EntityUtil.changeEntityListByOrika(StoreTmpDTO.class, list);
         return listTask;
     }
 
     @Override
     public void dealSingle(Object o) throws TaskAllocationException {
+        logger.info("开始执行队列");
         StoreTmpDTO t = (StoreTmpDTO) o;
         try {
-            ServiceResponse<Integer> serviceResponse = this.importDataToStore(t);
-            if (!serviceResponse.isSuccess()) {
-                t.setErrorMessage(serviceResponse.getMessage());
-            }
+            this.importDataToStore(t);
         } catch (Exception e) {
             logger.warn("写入门店表和成员表异常", e);
             t.setErrorMessage("导入异常");
@@ -80,7 +78,8 @@ public class StoreTaskServiceImpl extends AbstractTaskAllocationOperation implem
         }
     }
 
-    public ServiceResponse<Integer> importDataToStore(StoreTmpDTO t) {
+    public void importDataToStore(StoreTmpDTO t) {
+        logger.info("开始执行队列:id ==>{}", t.getStoreTmpId());
         StoreDTO storeDTO = new StoreDTO();
         storeDTO.setEnterpriseId(t.getEnterpriseId());
         storeDTO.setStoreName(t.getStoreName());
@@ -162,7 +161,15 @@ public class StoreTaskServiceImpl extends AbstractTaskAllocationOperation implem
         List<StoreExtendDTO> extendList = JSON.parseArray(customField, StoreExtendDTO.class);
         storeDTO.setStoreExtendList(extendList);
 
-        return storeApiService.saveOrUpdate(storeDTO);
+        ServiceResponse<Integer> serviceResponse = storeApiService.saveOrUpdate(storeDTO);
+        String msg;
+        if (serviceResponse.isSuccess()) {
+            msg = "success";
+        } else {
+            msg = serviceResponse.getMessage();
+        }
+        t.setErrorMessage(msg);
+        storeImportService.updateData(t);
     }
 
     @Override

gic-store-service/src/main/resources/mapper/TabStoreDictMapper.xml

@@ -103,23 +103,31 @@
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where store_dict_id = #{storeDictId,jdbcType=INTEGER}
   </update>
+
+  <update id="deleteStoreField" >
+    update tab_store_dict
+    set status=0
+    where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
+    and type = 'storeField'
+    and value = #{value,jdbcType=VARCHAR}
+  </update>
   <select id="listStoreType" parameterType="java.lang.Integer" resultType="java.lang.String">
     select
     value
     from tab_store_dict
-    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and type='storeType'
+    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and type='storeType' and status=1
   </select>
   <select id="listStoreStatus" parameterType="java.lang.Integer" resultType="java.lang.String">
     select
     value
     from tab_store_dict
-    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and type='storeStatus'
+    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and type='storeStatus' and status=1
   </select>
 
   <select id="listStoreField" parameterType="java.lang.Integer" resultType="java.lang.String">
     select
     value
     from tab_store_dict
-    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and type='storeField'
+    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and type='storeField' and status=1
   </select>
 </mapper>
\ No newline at end of file

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

@@ -104,12 +104,12 @@ public class StoreDictController {
 
     @RequestMapping("relevance-storefield")
     @ResponseBody
-    public RestResponse setStoreField(String value){
+    public RestResponse setStoreField(String value, int type){
         Integer enterpriseId = 1111;
         if(StringUtils.isBlank(value)){
             return EnterpriseRestResponse.failure(com.gic.enterprise.error.ErrorCode.ERR_2);
         }
-        ServiceResponse serviceResponse = this.storeDictApiService.saveStoreField(enterpriseId, value);
+        ServiceResponse serviceResponse = this.storeDictApiService.saveStoreField(enterpriseId, value, type);
         if(serviceResponse.isSuccess()){
             return RestResponse.success();
         }

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

@@ -281,20 +281,19 @@ public class StoreImportController {
 
         // 验证门店类型
         String storeType = row.get(3);
-        bean.setStoreType(storeCode);
+        bean.setStoreType(storeType);
         if (validate) {
-            if (StringUtils.isBlank(storeCode)) {
+            if (StringUtils.isBlank(storeType)) {
                 bean.setErrorMessage("门店类型不能为空");
                 validate = false;
             }
         }
-        // todo
-//        if (validate) {
-//            if (this.storeTypeValidate(enterpriseId, storeType) == -1) {
-//                bean.setErrorMessage("门店类型不存在");
-//                validate = false;
-//            }
-//        }
+        if (validate) {
+            if (this.storeTypeValidate(enterpriseId, storeType) == -1) {
+                bean.setErrorMessage("门店类型不存在");
+                validate = false;
+            }
+        }
         // 验证门店状态
         String erpStatus = row.get(4);
         bean.setErpStatus(erpStatus);
@@ -304,13 +303,12 @@ public class StoreImportController {
                 validate = false;
             }
         }
-        //todo
-//        if (validate) {
-//            if (this.erpStatusValidate(enterpriseId, erpStatus) == -1) {
-//                bean.setErrorMessage("门店状态不存在");
-//                validate = false;
-//            }
-//        }
+        if (validate) {
+            if (this.erpStatusValidate(enterpriseId, erpStatus) == -1) {
+                bean.setErrorMessage("门店状态不存在");
+                validate = false;
+            }
+        }
         // 验证门店电话
         String conactsPhone = row.get(5);
         bean.setConactsPhone(conactsPhone);