feat:欧泊莱定制

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

@@ -167,7 +167,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
         wxUserAddLogService.save(wxUserAddLogQDTO);
 
         //定制
-        addDelFriendEvent(related.getUnionid(), related.getClerkId(), enterpriseId, related.getMemberId(), related.getStoreId(), 0);
+        addDelFriendEvent(related.getUnionid(), related.getClerkId(),wxEnterpriseId, enterpriseId, related.getMemberId(), related.getStoreId(), 0);
     }
 
     /**
@@ -179,9 +179,9 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
      * @param memberId
      * @param storeId
      */
-    private void addDelFriendEvent(String unionId, String clerkId, String enterpriseId, String memberId, String storeId, Integer changeType) {
+    private void addDelFriendEvent(String unionId, String clerkId,String wxEnterpriseId, String enterpriseId, String memberId, String storeId, Integer changeType) {
         String addDelFriendEvent = config.getAddDelFriendEvent();
-        if (!addDelFriendEvent.contains(enterpriseId)) {
+        if (!addDelFriendEvent.contains(wxEnterpriseId)) {
             logger.info("非定制，无需广播通知");
             return;
         }

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

@@ -231,7 +231,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
 
         //定制
-        addDelFriendEvent(unionid, externalClerkRelated.getClerkId(), enterpriseId, memberId, externalClerkRelated.getStoreId());
+        addDelFriendEvent(unionid, externalClerkRelated.getClerkId(), wxEnterpriseId, enterpriseId, memberId, externalClerkRelated.getStoreId(), 1);
         //日志
         wxUserAddLogService.updateMemberInfo(wxEnterpriseId, enterpriseId, externalClerkRelated.getStaffId(), externalClerkRelated.getExternalUserId(), memberId);
     }
@@ -246,7 +246,14 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
      * @param memberId
      * @param storeId
      */
-    private void addDelFriendEvent(String unionId, String clerkId, String enterpriseId, String memberId, String storeId) {
+    private void addDelFriendEvent(String unionId, String clerkId, String wxEnterpriseId, String enterpriseId, String memberId, String storeId, Integer changeType) {
+        String addDelFriendEvent = config.getAddDelFriendEvent();
+        if (!addDelFriendEvent.contains(wxEnterpriseId)) {
+            log.info("非定制，无需广播通知");
+            return;
+        }
+
+        log.info("欧泊莱定制：unionId:{},clerkId:{}", unionId, changeType);
         //欧泊莱定制需求
         ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
         StoreDTO storeDTO = storeService.getStore(storeId);
@@ -265,7 +272,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
                 msgBody.put("clerkName", clerkDTO.getClerkName());
                 msgBody.put("clerkCode", clerkDTO.getClerkCode());
             }
-            msgBody.put("changeType", 1);
+            msgBody.put("changeType", changeType);
             msgBody.put("addCreateTime", new Date());
             msgBody.put("delCreateTime", "");
 
@@ -427,7 +434,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         if (qwDTO == null) {
             return Collections.emptyMap();
         }
-        List<MemberStaffRelExtDO> res = staffClerkRelationMapper.listMemberStaffRelNew(memberIdList, clerkIdList, enterpriseId,wxEnterpriseId);
+        List<MemberStaffRelExtDO> res = staffClerkRelationMapper.listMemberStaffRelNew(memberIdList, clerkIdList, enterpriseId, wxEnterpriseId);
         if (CollectionUtils.isEmpty(res)) {
             return Collections.emptyMap();
         }

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

@@ -196,7 +196,21 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                     return;
                 }
                 TabHaobanExternalClerkRelated related = tabHaobanExternalClerkRelatedList.get(0);
-                addDelFriendEvent(related.getUnionid(), related.getClerkId(), related.getEnterpriseId(), related.getMemberId(), related.getStoreId(), 0);
+                String enterpriseId = related.getEnterpriseId();
+                String wxEnterpriseId = related.getWxEnterpriseId();
+                //添加日志
+                WxUserAddLogQDTO wxUserAddLogQDTO = new WxUserAddLogQDTO();
+                wxUserAddLogQDTO.setWxEnterpriseId(wxEnterpriseId);
+                wxUserAddLogQDTO.setEnterpriseId(enterpriseId);
+                wxUserAddLogQDTO.setMemberId(related.getMemberId());
+                wxUserAddLogQDTO.setUnionid(related.getUnionid());
+                wxUserAddLogQDTO.setDelFlag(true);
+                wxUserAddLogQDTO.setExternalUserid(related.getExternalUserId());
+                wxUserAddLogQDTO.setStaffId(related.getStaffId());
+                wxUserAddLogQDTO.setClerkId(related.getClerkId());
+                wxUserAddLogQDTO.setDelClerkFlag(true);
+                wxUserAddLogService.save(wxUserAddLogQDTO);
+                addDelFriendEvent(related.getUnionid(), related.getClerkId(), wxEnterpriseId,enterpriseId, related.getMemberId(), related.getStoreId(), 0);
                 return;
             }
             this.delMemberUnionidRelatedProcess(memberUnionidRelatedDTO, qwFrientNoticeDTO.getWxUserId());
@@ -617,7 +631,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
 
         //定制事件订阅
-        addDelFriendEvent(unionId, clerkId, enterpriseId, memberId, storeId, 1);
+        addDelFriendEvent(unionId, clerkId,wxEnterpriseId, enterpriseId, memberId, storeId, 1);
         return memberId;
     }
 
@@ -630,9 +644,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      * @param memberId
      * @param storeId
      */
-    private void addDelFriendEvent(String unionId, String clerkId, String enterpriseId, String memberId, String storeId, Integer changeType) {
+    private void addDelFriendEvent(String unionId, String clerkId,String wxEnterpriseId, String enterpriseId, String memberId, String storeId, Integer changeType) {
         String addDelFriendEvent = config.getAddDelFriendEvent();
-        if (!addDelFriendEvent.contains(enterpriseId)) {
+        if (!addDelFriendEvent.contains(wxEnterpriseId)) {
             log.info("非定制，无需广播通知");
             return;
         }