Merge branch 'bugfix/2023-05-30' into 'master'

Bugfix/2023 05 30

See merge request !1294

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

@@ -227,7 +227,7 @@ public class AuditController extends WebBaseController {
         AuditDTO audit = auditApiService.findById(auditId);
         if (audit == null || audit.getAuditStatus() != 0) {
             RedisUtil.unlock(key);
-            return resultResponse(HaoBanErrCode.ERR_10017);
+            return resultResponse(HaoBanErrCode.ERR_100035);
         }
         String result = auditApiService.audit("", auditId, staffName, staffId);
         RedisUtil.unlock(key);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -132,6 +132,8 @@ public enum HaoBanErrCode {
      */
     ERR_100033(100033, "分组被关联，不可删除"),
     ERR_100034(100034, "微信预支付订单生成失败！"),
+
+    ERR_100035(100035,"该条记录已审核"),
     ;
     private int code;
     private String msg;

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

@@ -24,6 +24,7 @@ import com.gic.haoban.manage.web.vo.MarketingCountVO;
 import com.gic.haoban.manage.web.vo.notify.PairValVO;
 import com.gic.haoban.task.api.service.TelTaskApiService;
 import com.gic.haoban.task.manage.api.service.IMarketClueTaskApiService;
+import com.gic.redis.data.util.RedisUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,10 +33,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created 2021/12/16.
@@ -216,10 +214,20 @@ public class NotifyController extends WebBaseController {
         logger.info("查询是否店长：{}", clerkId);
         ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
         if (clerkDTO != null) {
-            Integer groupChatCount, telTaskCount, groupMessageCount, total = 0;
+            Integer groupChatCount = 0, telTaskCount=0, groupMessageCount=0, total = 0;
             Integer clerkType = clerkDTO.getClerkType();
             if (clerkType == 1 || clerkType == 2) {
                 //店长维度
+                //添加redis缓存
+                String cacheKey = "marketing_Count:"+storeId;
+                Object value = RedisUtil.getCache(cacheKey);
+                if (null != value){
+                    String cache = String.valueOf(value);
+                    List<String> cacheList = Arrays.asList(cache.split(","));
+                    groupChatCount = Integer.valueOf(cacheList.get(0));
+                    telTaskCount = Integer.valueOf(cacheList.get(1));
+                    groupMessageCount = Integer.valueOf(cacheList.get(2));
+                }else {
                     //社群群发
                     logger.info("店长维度查询社群群发");
                     groupChatCount = groupChatPlanApiService.getTotalCount(enterpriseId, null, storeId).getResult();
@@ -229,9 +237,23 @@ public class NotifyController extends WebBaseController {
                     //群发
                     logger.info("店长维度查询群发");
                     groupMessageCount = iMarketClueTaskApiService.getTotalCount(enterpriseId, null, storeId).getResult();
+                    String cacheValue = groupChatCount + "," + telTaskCount + "," + groupMessageCount;
+                    //缓存10分钟
+                    RedisUtil.setCache(cacheKey, cacheValue, 600L);
+                }
                 total = groupChatCount + telTaskCount + groupMessageCount;
             } else {
                 //导购维度
+                //添加redis缓存
+                String cacheKey = "marketing_Count:"+storeId+":"+clerkId;
+                Object value = RedisUtil.getCache(cacheKey);
+                if (null != value){
+                    String cache = String.valueOf(value);
+                    List<String> cacheList = Arrays.asList(cache.split(","));
+                    groupChatCount = Integer.valueOf(cacheList.get(0));
+                    telTaskCount = Integer.valueOf(cacheList.get(1));
+                    groupMessageCount = Integer.valueOf(cacheList.get(2));
+                }else {
                     //社群群发
                     logger.info("导购维度查询社群群发");
                     groupChatCount = groupChatPlanApiService.getTotalCount(enterpriseId, clerkId, storeId).getResult();
@@ -241,6 +263,10 @@ public class NotifyController extends WebBaseController {
                     //群发
                     logger.info("导购维度查询群发");
                     groupMessageCount = iMarketClueTaskApiService.getTotalCount(enterpriseId, clerkId, storeId).getResult();
+                    String cacheValue = groupChatCount + "," + telTaskCount + "," + groupMessageCount;
+                    //缓存10分钟
+                    RedisUtil.setCache(cacheKey, cacheValue, 600L);
+                }
                 total = groupChatCount + telTaskCount + groupMessageCount;
             }
             marketingCountVO.setGroupChatCount(groupChatCount);