Merge branch 'master_xgh_pendingid' into 'developer'

Master xgh pendingid

See merge request !285

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

@@ -158,14 +158,6 @@ public interface MemberUnionidRelatedApiService {
     String addExternal(ExternalUserDTO dto);
 
     /**
-     * 添加企微好友关联关系表-需触达方式
-     *
-     * @param dto
-     * @return
-     */
-    String addFriendExternal(ExternalUserDTO dto);
-
-    /**
      * 获取客户详情-第三方
      *
      * @param wxEnterpriseId

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

@@ -11,8 +11,6 @@ public interface MemberUnionidRelatedMapper {
 
     MemberUnionidRelated selectByPrimaryKey(String memberUnionidRelatedId);
 
-    MemberUnionidRelated getByUnionId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffId") String staffId, @Param("unionid") String unionid);
-    
     // 删除好友
     void deleteByUnionidAndUserId(@Param("externalUserid") String externalUserid, @Param("staffId") String staffId);
 

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

@@ -43,6 +43,15 @@ public class TabHaobanExternalClerkRelated implements Serializable {
     private Date createTime;
 
     private Date updateTime;
+    private String selfExternalUserid;
+
+    public String getSelfExternalUserid() {
+        return selfExternalUserid;
+    }
+
+    public void setSelfExternalUserid(String selfExternalUserid) {
+        this.selfExternalUserid = selfExternalUserid;
+    }
 
     public String getHeadUrl() {
         return headUrl;

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

@@ -5,8 +5,6 @@ import java.util.List;
 import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
 
 public interface MemberUnionRelatedService {
-
-	MemberUnionidRelatedDTO getByWxUserIdAndUnionId(String wxEnterpriseId, String staffId, String unionid);
 	
 	String addMemberUnionidRelated(MemberUnionidRelatedDTO dto);
 	

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

@@ -20,11 +20,6 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 	private MemberUnionidRelatedMapper mapper;
 	
 	@Override
-	public MemberUnionidRelatedDTO getByWxUserIdAndUnionId(String wxEnterpriseId, String staffId, String unionid) {
-		return EntityUtil.changeEntityByJSON(MemberUnionidRelatedDTO.class, mapper.getByUnionId(wxEnterpriseId, staffId, unionid));
-	}
-	
-	@Override
 	public String addMemberUnionidRelated(MemberUnionidRelatedDTO dto) {
 		dto.setStatusFlag(1);
 		dto.setCreateTime(new Date());

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -27,6 +27,7 @@
     <dubbo:service interface="com.gic.haoban.manage.api.service.KeyDataApiService" ref="keyDataApiService" timeout="10000"/>
     <dubbo:service interface="com.gic.haoban.manage.api.service.hm.HmLinkApiService" ref="hmLinkApiService" timeout="10000"/>
 	<dubbo:service interface="com.gic.haoban.manage.api.service.HaobanUserApiService" ref="haobanUserApiService" timeout="10000"/>
+	<dubbo:service interface="com.gic.haoban.manage.api.service.QwFriendApiService" ref="qwFriendApiService" timeout="10000"/>
     <dubbo:service interface="com.gic.haoban.manage.api.service.ApplicationApiService" ref="applicationApiServiceImpl"
                    timeout="10000"/>
     <dubbo:service interface="com.gic.haoban.manage.api.service.TestApiService" ref="testServiceImpl" timeout="10000"/>

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

@@ -39,17 +39,6 @@
                 #{enterpriseId})
     </insert>
     
-    <select id="getByUnionId" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_member_unionid_related
-        where staff_id = #{staffId}
-        and wx_enterprise_id=#{wxEnterpriseId}
-        and status_flag = 1
-        and unionid = #{unionid}
-        limit 1
-    </select>
-
     <update id="deleteByUnionidAndUserId" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
         update tab_haoban_member_unionid_related
         set status_flag = 0,

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

@@ -91,6 +91,9 @@
             <if test="updateTime != null">
                 update_time,
             </if>
+            <if test="selfExternalUserid != null">
+            	self_external_userid,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="externalClerkRelatedId != null">
@@ -147,6 +150,9 @@
             <if test="updateTime != null">
                 #{updateTime,jdbcType=TIMESTAMP},
             </if>
+             <if test="selfExternalUserid != null">
+            	#{selfExternalUserid},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective"