Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java

@@ -21,7 +21,7 @@ public interface TabHaobanExternalClerkRelatedMapper {
     TabHaobanExternalClerkRelated selectByClerkIdAndExternalUserId(@Param("clerkId") String clerkId,
                                                                    @Param("externalUserId") String externalUserId);
 
-    void delByUserIdAndExternalUserId(TabHaobanExternalClerkRelated record);
+    int delByUserIdAndExternalUserId(TabHaobanExternalClerkRelated record);
 
     void delByUserIdAndExternalUserIdBatch(@Param("wxUserId") String wxUserId,
                                            @Param("wxEnterpriseId") String wxEnterpriseId,

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

@@ -11,6 +11,10 @@ public interface ExternalClerkRelatedService {
 
 	void insert(TabHaobanExternalClerkRelated related);
 
+	/**
+	 * 删除好友
+	 * @param dto
+	 */
 	void delByUserIdAndExternalUserId(MemberUnionidRelatedDTO dto);
 
 	/**

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

 package com.gic.haoban.manage.service.service.impl;
 
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.StringUtil;
@@ -69,7 +70,11 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
 
     @Override
     public void delByUserIdAndExternalUserId(MemberUnionidRelatedDTO dto) {
-        mapper.delByUserIdAndExternalUserId(EntityUtil.changeEntityByJSON(TabHaobanExternalClerkRelated.class, dto));
+        int count = mapper.delByUserIdAndExternalUserId(EntityUtil.changeEntityByJSON(TabHaobanExternalClerkRelated.class, dto));
+        if (count <= 0) {
+            logger.error("无需删除的好友数据：{}", JSON.toJSONString(dto));
+            return;
+        }
         String wxUserId = dto.getWxUserId();
         String externalUserid = dto.getExternalUserid();
         List<TabHaobanExternalClerkRelated> tabHaobanExternalClerkRelatedList = mapper.listByExTernalUseridAndWxUserId(externalUserid, wxUserId, 2);

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

@@ -230,8 +230,7 @@
         and status_flag = 1
     </select>
 
-    <update id="delByUserIdAndExternalUserId"
-            parameterType="com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated">
+    <update id="delByUserIdAndExternalUserId" parameterType="com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated" >
         update tab_haoban_external_clerk_related
         set status_flag = 2,
             update_time = now()