feat：增加注释

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

@@ -4,20 +4,22 @@ package com.gic.haoban.manage.api.enums;
  * Created by hua on 2020/4/10.
  */
 public enum PreDealTypeEnum {
-    all(-1),
-    group(0),
-    store(1),
-    clerk(2),
-	friend_clerk(6),
-	friend(8),
-	self_friend(7),
-    friend_merge(9),
-    tag(10),
-    tag_member(11);
+    all(-1, "全部"),
+    group(0, "分组"),
+    store(1, "门店"),
+    clerk(2, "成员"),
+    friend_clerk(6, "导购"),
+    self_friend(7, "自建好友"),
+    friend(8, "第三方好友"),
+    friend_merge(9, "好友数据合并"),
+    tag(10, "标签"),
+    tag_member(11, "会员标签");
     private int val;
+    private String name;
 
-    PreDealTypeEnum(int val) {
+    PreDealTypeEnum(int val, String name) {
         this.val = val;
+        this.name = name;
     }
 
     public int getVal() {
@@ -27,4 +29,12 @@ public enum PreDealTypeEnum {
     public void setVal(int val) {
         this.val = val;
     }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
 }

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

@@ -102,7 +102,6 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         logger.info("部门同步处理mq处理中:{}", params);
         DealParamMqDTO dealParamMqDTO = JSONObject.parseObject(params, DealParamMqDTO.class);
         TabHaobanPreDealLog dataPre = preDealService.getByDataId(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dealParamMqDTO.getType() - 1, PreDealStatusEnum.all.getVal());
-
         if (dataPre == null) {
             logger.info("待处理数据不存在:{}", params);
             return;
@@ -132,14 +131,10 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             operationMap.get("friendClerkSyncNewOperation").dealSingleByMq(dealParamMqDTO, dataPre);
         } else if (dataPre.getDataType().equals(PreDealTypeEnum.friend.getVal())) {
             operationMap.get("friendSyncNewOperation").dealSingleByMq(dealParamMqDTO, dataPre);
-            logger.info("好友处理：{}", params);
-
+            logger.info("第三方好友处理：{}", params);
         } else if (dataPre.getDataType().equals(PreDealTypeEnum.self_friend.getVal())) {
             operationMap.get("selfFriendSyncNewOperation").dealSingleByMq(dealParamMqDTO, dataPre);
-            logger.info("好友处理：{}", params);
-        } else if (dataPre.getDataType().equals(PreDealTypeEnum.friend_merge.getVal())) {
-            operationMap.get("friendMergeSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
-            logger.info("好友合并处理：{}", params);
+            logger.info("自建好友处理：{}", params);
         } else if (dataPre.getDataType().equals(PreDealTypeEnum.tag.getVal())) {
             operationMap.get("friendTagSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
             logger.info("会员标签处理：{}", params);
@@ -149,7 +144,6 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         } else {
             logger.info("不是正常数据:{}", params);
         }
-
     }