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

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/YwWxEnterpriseDTO.java

@@ -28,6 +28,10 @@ public class YwWxEnterpriseDTO implements Serializable {
     private String corpSquareLogoUrl;
     //关联商户数量
     private Integer relationCount=0;
+	/**
+	 * 是否开启标签同步标记 1 是 0 否
+	 */
+	private Integer tagOpenFlag;
 
     
     public static long getSerialversionuid() {
@@ -133,4 +137,11 @@ public class YwWxEnterpriseDTO implements Serializable {
 		this.version = version;
 	}
 
+	public Integer getTagOpenFlag() {
+		return tagOpenFlag;
+	}
+
+	public void setTagOpenFlag(Integer tagOpenFlag) {
+		this.tagOpenFlag = tagOpenFlag;
+	}
 }

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

@@ -38,7 +38,7 @@ public interface ExternalClerkRelatedApiService {
 	List<ExternalClerkRelatedDTO> listByEnterpriseIdAndDate(String enterpriseId,Date date);
 
 	Page<ExternalClerkRelatedDTO> pageMemberUnionByParams(List<String> userIdList, List<String> sendMemberIds,
-			String enterpriseId, BasePageInfo pageInfo);
+														  String enterpriseId, BasePageInfo pageInfo);
 
 	List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserId(String wxUserId, String wxEnterpriseId);
 
@@ -74,66 +74,78 @@ public interface ExternalClerkRelatedApiService {
 	 */
 	ServiceResponse<ExternalClerkRelatedDTO> bindMemberIdExternalByRelationKey(String relationKey, String enterpriseId, String memberId, String unionid);
 
-    /**
-     * 查询clerk与union好友关系
-     *
-     * @param enterpriseId
-     * @return
-     */
-    ExternalClerkRelatedDTO getClerkFriendByUnionid(String enterpriseId, String clerkId, String unionid);
-
-    /**
-     * 获取企业下的关联关系列表
-     *
-     * @return
-     */
-    List<ExternalClerkRelatedDTO> listExternalClerkByWxUserIdAncExternalUserId(String wxEnterpriseId, String wxUserId, String enterpriseId, String externalUserId);
-
-    /**
-     * 根据id查询列表
-     *
-     * @param wxEnterpriseId
-     * @param ids
-     * @return
-     */
-    List<ExternalClerkRelatedDTO> listByIds(String wxEnterpriseId, List<String> ids);
-
-    /**
-     * 查询导购好友关联
-     *
-     * @param wxEnterpriseId : 微信企业id
-     * @return : 返回好友关联
-     */
-    Page<String> pageExternalByEnterpriseId(String wxEnterpriseId, String enterpriseId, BasePageInfo pageInfo);
-
-    /**
-     * 查询导购好友关联
-     *
-     * @param wxEnterpriseId : 微信企业id
-     * @return : 返回好友关联
-     */
-    Page<String> pageExternalByEnterpriseId(String wxEnterpriseId, String enterpriseId, int pageNum, int pageSize);
+	/**
+	 * 查询clerk与union好友关系
+	 *
+	 * @param enterpriseId
+	 * @return
+	 */
+	ExternalClerkRelatedDTO getClerkFriendByUnionid(String enterpriseId, String clerkId, String unionid);
+
+	/**
+	 * 获取企业下的关联关系列表
+	 *
+	 * @return
+	 */
+	List<ExternalClerkRelatedDTO> listExternalClerkByWxUserIdAncExternalUserId(String wxEnterpriseId, String wxUserId, String enterpriseId, String externalUserId);
+
+	/**
+	 * 根据id查询列表
+	 *
+	 * @param wxEnterpriseId
+	 * @param ids
+	 * @return
+	 */
+	List<ExternalClerkRelatedDTO> listByIds(String wxEnterpriseId, List<String> ids);
+
+	/**
+	 * 查询导购好友关联
+	 *
+	 * @param wxEnterpriseId : 微信企业id
+	 * @return : 返回好友关联
+	 */
+	Page<String> pageExternalByEnterpriseId(String wxEnterpriseId, String enterpriseId, BasePageInfo pageInfo);
+
+	/**
+	 * 查询导购好友关联
+	 *
+	 * @param wxEnterpriseId : 微信企业id
+	 * @return : 返回好友关联
+	 */
+	Page<String> pageExternalByEnterpriseId(String wxEnterpriseId, String enterpriseId, int pageNum, int pageSize);
+
+
+	/**
+	 * 获取企业下的关联关系的 memberIds
+	 *
+	 * @return
+	 */
+	List<String> listExternalClerkMemberIdsByMemberIds(String wxEnterpriseId, List<String> memberIds);
 
+	/**
+	 * 获取企业下的关联关系列表
+	 *
+	 * @return
+	 */
+	List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberIds(String wxEnterpriseId, List<String> memberIds);
 
 	/**
-     * 获取企业下的关联关系的 memberIds
-     *
+	 * 获取企业下的关联关系列表
+	 *
 	 * @return
 	 */
-    List<String> listExternalClerkMemberIdsByMemberIds(String wxEnterpriseId, List<String> memberIds);
-
-    /**
-     * 获取企业下的关联关系列表
-     *
-     * @return
-     */
-    List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberIds(String wxEnterpriseId, List<String> memberIds);
-
-    /**
-     * 获取企业下的关联关系列表
-     *
-     * @return
-     */
-    List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberId(String memberId);
+	List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberId(String memberId);
+
+
+	/**
+	 * gic删除会员，解除好办与gic关联关系
+	 *
+	 * @param memberId      会员ID
+	 * @param enterpriseId  企业标识
+	 * @param mergeMemberId 合并后的会员ID 删除传null，
+	 * @author mozhu
+	 * @date 2021-09-13 16:52:31
+	 */
+	void delByMemberIdAndEnterpriseId(String memberId, String enterpriseId, String mergeMemberId);
 
 }

haoban-manage3-operation-web/pom.xml

@@ -225,7 +225,12 @@
 			<artifactId>sharing-core-api</artifactId>
 			<version>${sharing-core-api}</version>
 		</dependency>
-	</dependencies>
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>haoban-app-customer-api</artifactId>
+			<version>${haoban-app-customer-api}</version>
+		</dependency>
+    </dependencies>
 
 	<build>
 		<finalName>haoban-manage3-operation-web</finalName>

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

@@ -74,9 +74,12 @@ public enum HaoBanErrCode {
     ERR_10020(10020,"模板名称已存在"),
     
     ERR_20001(20001,"企业微信商户不存在"),
-    
+
     
     ERR_20002(20002,"门店不存在"),
+
+    ERR_30001(30001,"已存在同步任务, 无法关闭"),
+
     ERR_DEFINE(-888, "自定义错误"),
     ERR_OTHER(-999, "未知错误code");
     private int code;

haoban-manage3-operation-web/src/main/webapp/WEB-INF/dubbo-haoban-manage3-operation-web.xml

@@ -57,4 +57,7 @@
 	<dubbo:reference interface="com.gic.sharing.core.service.api.service.MqApiService"
 					 id="mqApiService"/>
 
+	<dubbo:reference interface="com.gic.haoban.app.customer.service.api.service.QywxTagSyncApiService"
+					 id="qywxTagSyncApiService"/>
+
 </beans>

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

 package com.gic.haoban.manage.service.dao.mapper;
 
+import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
+import com.github.pagehelper.Page;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
-
-import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
-import com.github.pagehelper.Page;
-
 public interface TabHaobanExternalClerkRelatedMapper {
     int deleteByPrimaryKey(String externalClerkRelatedId);
 
@@ -20,8 +19,6 @@ public interface TabHaobanExternalClerkRelatedMapper {
 
     int updateByPrimaryKeySelective(TabHaobanExternalClerkRelated record);
 
-    int updateByPrimaryKey(TabHaobanExternalClerkRelated record);
-
 	TabHaobanExternalClerkRelated selectByClerkIdAndExternalUserId(@Param("clerkId")String clerkId, @Param("externalUserId")String externalUserId);
 
 	void delByUserIdAndExternalUserId(TabHaobanExternalClerkRelated record);
@@ -201,4 +198,15 @@ public interface TabHaobanExternalClerkRelatedMapper {
 	 * @return
 	 */
 	int updateMemberIdByMemberId(@Param("memberId") String memberId, @Param("oldMemberId") String oldMemberId);
+
+	/**
+	 * 更新状态通过会员id
+	 *
+	 * @param memberId     会员ID
+	 * @param enterpriseId 企业id
+	 * @return int
+	 * @author mozhu
+	 * @date 2021-09-13 16:59:49
+	 */
+	int updateStatusByMemberId(@Param("memberId") String memberId, @Param("enterpriseId") String enterpriseId);
 }
\ No newline at end of file

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

@@ -228,26 +228,7 @@
     </set>
     where external_clerk_related_id = #{externalClerkRelatedId,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated" >
-    update tab_haoban_external_clerk_related
-    set wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
-      enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
-      store_id = #{storeId,jdbcType=VARCHAR},
-      member_id = #{memberId,jdbcType=VARCHAR},
-      unionid = #{unionid,jdbcType=VARCHAR},
-      external_name = #{externalName,jdbcType=VARCHAR},
-      add_create_time = #{addCreateTime,jdbcType=VARCHAR},
-      member_unionid_related_id = #{memberUnionidRelatedId,jdbcType=VARCHAR},
-      clerk_id = #{clerkId,jdbcType=VARCHAR},
-      staff_id = #{staffId,jdbcType=VARCHAR},
-      wx_user_id = #{wxUserId,jdbcType=VARCHAR},
-      status_flag = #{statusFlag,jdbcType=INTEGER},
-      external_user_id = #{externalUserId},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
-    where external_clerk_related_id = #{externalClerkRelatedId,jdbcType=VARCHAR}
-  </update>
-  
+
   <select id="selectByClerkIdAndExternalUserId" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
     <include refid="Base_Column_List" />
@@ -577,11 +558,18 @@
   <update id="updateMemberIdByMemberId">
     UPDATE
       tab_haoban_external_clerk_related
-    SET
-      member_id=#{memberId},
-      update_time = now()
-    where
-      member_id = #{oldMemberId}
-    and status_flag = 1
+    SET member_id=#{memberId},
+        update_time = now()
+    where member_id = #{oldMemberId}
+      and status_flag = 1
+  </update>
+
+  <update id="updateStatusByMemberId">
+    UPDATE
+      tab_haoban_external_clerk_related
+    SET status_flag = 0,
+        update_time = now()
+    where member_id = #{memberId}
+      and enterprise_id = #{enterpriseId}
   </update>
 </mapper>
\ No newline at end of file