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

@@ -136,4 +136,16 @@ public interface ExternalClerkRelatedApiService {
 	 */
 	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,6 +225,11 @@
 			<artifactId>sharing-core-api</artifactId>
 			<version>${sharing-core-api}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>haoban-app-customer-api</artifactId>
+			<version>${haoban-app-customer-api}</version>
+		</dependency>
     </dependencies>
 
 	<build>

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

@@ -77,6 +77,9 @@ public enum HaoBanErrCode {
 
     
     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/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java

@@ -5,8 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GICMQClientUtil;
-import com.gic.haoban.app.customer.dto.SearchComputeDTO;
-import com.gic.haoban.app.customer.dto.SearchDataDTO;
 import com.gic.haoban.app.customer.enums.GicQywxSyncTypeEnum;
 import com.gic.haoban.app.customer.enums.QywxSyncTaskTypeEnum;
 import com.gic.haoban.base.api.common.BasePageInfo;
@@ -20,32 +18,21 @@ import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMap
 import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
 import com.gic.haoban.manage.service.pojo.QywxTagSyncInfoPojo;
-import com.gic.member.api.dto.MemberDTO;
-import com.gic.member.api.service.MemberApiService;
-import com.gic.member.api.service.MemberService;
 import com.gic.mq.sdk.GicMQClient;
-import com.gic.search.engine.api.constant.MemberDataEnum;
-import com.gic.search.engine.api.constant.OperateEnum;
-import com.gic.search.engine.api.dto.ESResponseQueryBatch;
-import com.gic.search.engine.api.dto.ESResponseQuerySingle;
-import com.gic.search.engine.api.dto.dynamic.DynamicSearchDTO;
-import com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
 @Service
-public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedApiService{
+public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedApiService {
     private static final Logger log = LogManager.getLogger(ExternalClerkRelatedApiServiceImpl.class);
     @Autowired
     private TabHaobanExternalClerkRelatedMapper tabHaobanExternalClerkRelatedMapper;
@@ -76,35 +63,38 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
      * @return : 返回会员导购关联关系
      */
     @Override
-	public List<ExternalClerkRelatedDTO> listByMemberIdAndWxEnterpriseId(String memberId, String wxEnterpriseId, String enterpriseId){
+    public List<ExternalClerkRelatedDTO> listByMemberIdAndWxEnterpriseId(String memberId, String wxEnterpriseId, String enterpriseId) {
         List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listByMemberIdAndWxEnterpriseId(memberId, wxEnterpriseId, enterpriseId);
-		return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class,list);
+        return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class, list);
     }
 
     @Override
     public List<ExternalClerkRelatedDTO> listByEnterpriseIdAndDate(
             String enterpriseId, Date date) {
-		List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listByEnterpriseIdAndDate(enterpriseId,date);
-		return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class,list);	
+        List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listByEnterpriseIdAndDate(enterpriseId, date);
+        return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class, list);
     }
+
     @Override
     public Page<ExternalClerkRelatedDTO> pageMemberUnionByParams(List<String> userIdList, List<String> sendMemberIds,
                                                                  String enterpriseId, BasePageInfo pageInfo) {
         PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
-		return  PageUtil.changePageHelperToCurrentPage(tabHaobanExternalClerkRelatedMapper.pageMemberUnionByParams(userIdList,sendMemberIds,enterpriseId),ExternalClerkRelatedDTO.class);
+        return PageUtil.changePageHelperToCurrentPage(tabHaobanExternalClerkRelatedMapper.pageMemberUnionByParams(userIdList, sendMemberIds, enterpriseId), ExternalClerkRelatedDTO.class);
     }
+
     @Override
     public List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserId(String wxUserId, String wxEnterpriseId) {
 
-		return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class, tabHaobanExternalClerkRelatedMapper.listByWxEnterpriseIdAndWxUserId(wxUserId,wxEnterpriseId));
+        return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class, tabHaobanExternalClerkRelatedMapper.listByWxEnterpriseIdAndWxUserId(wxUserId, wxEnterpriseId));
     }
+
     @Override
     public List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserIds(List<String> userIdList,
                                                                           String wxEnterpriseId) {
-		if(userIdList == null || userIdList.isEmpty()){
+        if (userIdList == null || userIdList.isEmpty()) {
             return Collections.EMPTY_LIST;
         }
-		return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class, tabHaobanExternalClerkRelatedMapper.listByWxEnterpriseIdAndWxUserIds(userIdList,wxEnterpriseId));
+        return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class, tabHaobanExternalClerkRelatedMapper.listByWxEnterpriseIdAndWxUserIds(userIdList, wxEnterpriseId));
     }
 
     @Override
@@ -232,4 +222,15 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         return EntityUtil.changeEntityListNew(ExternalClerkRelatedShortInfoDTO.class, list);
     }
 
+    @Override
+    public void delByMemberIdAndEnterpriseId(String memberId, String enterpriseId, String mergeMemberId) {
+        if (StringUtils.isBlank(mergeMemberId)) {
+            //删除会员
+            tabHaobanExternalClerkRelatedMapper.updateStatusByMemberId(memberId, enterpriseId);
+        } else {
+            //合并会员
+            tabHaobanExternalClerkRelatedMapper.updateMemberIdByMemberId(mergeMemberId, memberId);
+        }
+    }
+
 }

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

@@ -228,25 +228,6 @@
     </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 
@@ -577,11 +558,18 @@
   <update id="updateMemberIdByMemberId">
     UPDATE
       tab_haoban_external_clerk_related
-    SET
-      member_id=#{memberId},
+    SET member_id=#{memberId},
         update_time = now()
-    where
-      member_id = #{oldMemberId}
+    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