Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/AppPageType.java

@@ -27,7 +27,10 @@ public enum AppPageType {
     //我的关联记录
     MY_RELATED_RECORD(11,	"store_relate_my_record_list"),
     //门店关联记录
-    STORE_RELATED_RECORD(12,	"store_relate_store_record_list");
+    STORE_RELATED_RECORD(12,	"store_relate_store_record_list"),
+    //edaixi订单详情
+    EDAIXI_DETAIL(13,	"hbapp_eWashing_order_preview");
+
 
     AppPageType(int type, String desc){
         this.code = type;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java

@@ -572,5 +572,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             departmentService.cleanDepartment(wxEnterpriseId,groupIdList);
         }
 
+        RedisUtil.delCache("department-list-cache-"+wxEnterpriseId);
+
     }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DepartmentApiServiceImpl.java

@@ -242,12 +242,14 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 		if(enterpriseDTO != null) {
 			SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(enterpriseDTO.getWxEnterpriseId(), SecretTypeEnum.CONTACT_SECRET.getVal());
 			if (null == secretSetting || secretSetting.getCheckFlag()==0) {
+				logger.info("没有设置通讯录secret:{}",JSONObject.toJSONString(secretSetting));
 				hr.setCode(0);
 				hr.setMessage("没有设置通讯录secret");
 				return hr;
 			}
 			JSONResponse jp = qywxDepartmentApiService.deleteSelfDepartment(enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), Integer.parseInt(department.getWxDepartmentId()));
 			if(jp.getErrorCode() != 0) {
+				logger.info("微信删除部门失败:{}",JSONObject.toJSONString(jp));
 				hr.setCode(0);
 				hr.setMessage("微信删除部门失败");
 				return hr;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/QywxClerkSyncOperation.java

@@ -127,8 +127,8 @@ public class QywxClerkSyncOperation implements BaseSyncOperation {
             } else {
                 syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.compute.getVal());
                 dealSyncOperationApiService.unlockTask(syncTask.getWxEnterpriseId());
+                dealSyncOperationApiService.cleanDiffrence(syncTask.getWxEnterpriseId(),taskId);
             }
-            dealSyncOperationApiService.cleanDiffrence(syncTask.getWxEnterpriseId(),taskId);
         }
         RedisUtil.unlock(key);
     }

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -347,7 +347,7 @@
     status_flag = 0,
 
     update_time = now()
-    where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR} and status_flag = 1
+    where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR} and status_flag = 1 and super_manager_flag!=1
     and staff_id not in
     <foreach collection="staffIds" item="item" open="(" separator="," close=")">
       #{item}

haoban-manage3-service/src/test/java/Setest.java

 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.symmetric.AES;
 import com.alibaba.fastjson.JSONObject;
+import com.gic.haoban.contacts.manage.api.dto.StoreAddDTO;
 import com.gic.haoban.manage.api.dto.SyncSingleDealDTO;
 import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
 import org.junit.Test;
@@ -13,22 +14,43 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 public class Setest {
 
-    @Autowired
-    private DealSyncOperationApiService dealSyncOperationApiService;
+
 
     @Test
     public void test() {
-        Map<String,String> ret=new HashMap<>();
-        ret.put("test","test");
-        ret.put("name","name11");
-        AES aes = SecureUtil.aes("test111111111113".getBytes());
-        String code = aes.encryptHex(JSONObject.toJSONString(ret));
-        System.out.println(code);
-        String str = aes.decryptStr(code);
-        System.out.println(str);
+        List<StoreAddDTO> list=new ArrayList<>();
+        {
+            StoreAddDTO storeAddDTO = new StoreAddDTO();
+            storeAddDTO.setBrandId("1");
+            storeAddDTO.setStoreName("1-1");
+            list.add(storeAddDTO);
+        }
+        {
+            StoreAddDTO storeAddDTO = new StoreAddDTO();
+            storeAddDTO.setBrandId("2");
+            storeAddDTO.setStoreName("2-1");
+            list.add(storeAddDTO);
+        }
+        {
+            StoreAddDTO storeAddDTO = new StoreAddDTO();
+            storeAddDTO.setBrandId("1");
+            storeAddDTO.setStoreName("1-2");
+            list.add(storeAddDTO);
+        }
+        {
+            StoreAddDTO storeAddDTO = new StoreAddDTO();
+            storeAddDTO.setBrandId("2");
+            storeAddDTO.setStoreName("2-2");
+            list.add(storeAddDTO);
+        }
+
+        Map<String, List<StoreAddDTO>> collect = list.stream().collect(Collectors.groupingBy(StoreAddDTO::getBrandId, Collectors.toList()));
+
+        System.out.println(JSONObject.toJSONString(collect));
     }
 
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/TestController.java

@@ -2,10 +2,13 @@ package com.gic.haoban.manage.web.controller;
 
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.DepartmentDTO;
+import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
 import com.gic.haoban.manage.api.service.TestApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.QywxXcxSendMessageQo;
+import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import org.slf4j.Logger;
@@ -16,8 +19,12 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.List;
+import java.util.TreeMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * Created 2020/4/9.
@@ -42,6 +49,9 @@ public class TestController extends WebBaseController {
     @Autowired
     private TestApiService testApiService;
 
+    @Autowired
+    private DepartmentApiService departmentApiService;
+
     @RequestMapping("/send-message-test")
     public HaobanResponse testSendMessage(QywxXcxSendMessageQo qo) {
         QywxXcxSendMessageDTO messageDTO = EntityUtil.changeEntityByOrika(QywxXcxSendMessageDTO.class, qo);
@@ -80,4 +90,28 @@ public class TestController extends WebBaseController {
         }
         return resultResponse(HaoBanErrCode.ERR_1);
     }
+
+    @RequestMapping("/del-department-batch")
+    public HaobanResponse departmentDel(String departmentId) {
+        String key="del-department-batch";
+        Object cache = RedisUtil.getCache(key);
+        if (null != cache) {
+            return resultResponse(HaoBanErrCode.ERR_0);
+        }
+        RedisUtil.setCache(key,1,120L, TimeUnit.SECONDS);
+        DepartmentDTO departmentDTO = departmentApiService.selectById(departmentId);
+        if (null == departmentDTO) {
+            return resultResponse(HaoBanErrCode.ERR_0);
+        }
+        List<DepartmentDTO> departmentDTOS = departmentApiService.listByChainId(departmentDTO.getChainId(), departmentDTO.getWxEnterpriseId());
+        TreeMap<Integer, List<DepartmentDTO>> treeMap = departmentDTOS.stream().collect(Collectors.groupingBy(DepartmentDTO::getLevel, TreeMap::new, Collectors.toList()));
+        treeMap.descendingMap().forEach((midKey, val) -> {
+            val.forEach(departmentDTO1 -> {
+                departmentApiService.del(departmentDTO1.getDepartmentId());
+            });
+        });
+
+        RedisUtil.delCache(key);
+        return resultResponse(HaoBanErrCode.ERR_1);
+    }
 }