会员的好友导购列表

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

@@ -108,6 +108,8 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
 
     private static final String LOCK_SUCCESS_KEY = "sync_wx_success_lock_";
 
+    private static final String FRIEND_LOCK = "haoban_fresh_wx_friend_lock_";
+
     @Override
     public void departmentDealMq(String params) {
         logger.info("mq处理中:{}", params);
@@ -692,6 +694,15 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
 
 	@Override
     public String createWxFriendTaskSingle(String wxEnterpriseId, String taskName, String staffId, String staffName, int syncTaskType) {
+        String lockKey = FRIEND_LOCK + "_lock_" + staffId;
+        String staffLockKey = FRIEND_LOCK + staffId;
+        RedisUtil.lock(lockKey, 2L);
+
+        Object cache = RedisUtil.getCache(staffLockKey);
+        if (null != cache) {
+            RedisUtil.unlock(lockKey);
+            return null;
+        }
         TabHaobanSyncTask tabHaobanSyncTask = new TabHaobanSyncTask();
         tabHaobanSyncTask.setAddUser(staffId);
         tabHaobanSyncTask.setTaskName(SyncTaskTypeEnum.getTaskName(syncTaskType));
@@ -701,7 +712,8 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         tabHaobanSyncTask.setTaskId(ToolUtil.randomUUID());
         tabHaobanSyncTask.setTaskType(syncTaskType);
         syncTaskService.createTask(tabHaobanSyncTask);
-        
+        RedisUtil.setCache(staffLockKey, tabHaobanSyncTask.getTaskId());
+        RedisUtil.unlock(lockKey);
         return tabHaobanSyncTask.getTaskId();
 	}
 

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

@@ -36,7 +36,7 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
     private MemberUnionidRelatedApiService memberUnionidRelatedApiService;
     @Autowired
     private SyncTaskService syncTaskService;
-
+    private static final String FRIEND_LOCK = "haoban_fresh_wx_friend_lock_";
 
     @Override
     public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
@@ -143,6 +143,8 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
         } else {
             syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.compute.getVal());
         }
+        String staffLockKey = FRIEND_LOCK + syncTask.getAddUser();
+        RedisUtil.delCache(staffLockKey);
         RedisUtil.unlock(key);
 
     }

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

@@ -402,7 +402,7 @@ public class ClerkController extends WebBaseController{
 			if(StringUtils.isNotBlank(taskId)){
 				dealSyncOperationApiService.dealWxFriendClerkSingle(taskId,wxUserId,staffId,wxEnterpriseId);
 			}else{
-				return resultResponse(HaoBanErrCode.ERR_999);
+				return resultResponse(HaoBanErrCode.ERR_10022);
 			}
 		} else {
 			String taskName = "刷新门店好友";
@@ -410,7 +410,7 @@ public class ClerkController extends WebBaseController{
 			if (StringUtils.isNotBlank(taskId)) {
 				dealSyncOperationApiService.dealWxFriendStore(taskId, storeId, wxEnterpriseId);
 			} else {
-				return resultResponse(HaoBanErrCode.ERR_999);
+				return resultResponse(HaoBanErrCode.ERR_10022);
 			}
 		}
 		return resultResponse(HaoBanErrCode.ERR_1);

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

@@ -200,27 +200,29 @@ public enum HaoBanErrCode {
     ERR_10012(10012,"手机号格式不正确"),
     ERR_10013(10013,"code已经存在"),
     ERR_10014(10014,"请输入手机号"),
-    
     ERR_10015(10015,"素材不存在"),
-    
+
     ERR_10016(10016,"导购不存在"),
-    
+
     ERR_10017(10017,"审核记录不存在"),
-    
+
     ERR_10018(10018,"审核记录已存在"),
 
     ERR_10019(10019,"没有配置secret"),
-    
+
     ERR_10020(10020,"该用户已在该门店绑定过code"),
 
     ERR_10021(10021,"待审核中存在code或该手机号"),
-    
+
+    ERR_10022(10022, "已有刷新在执行中,请不要重复刷新"),
+
     ERR_11122(11122,"手机号已存在"),
 
     ERR_999(999, "操作失败"),
     ERR_DEFINE(-888, "自定义错误"),
     
     ERR_OTHER(-999, "未知错误code");
+
     private int code;
     private String msg;