Merge remote-tracking branch 'origin/feature/七月迭代'

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

@@ -315,4 +315,12 @@ public interface ExternalClerkRelatedApiService {
     int getCountExternalClerk(String wxEnterpriseId, String staffId, List<Integer> statusFlags);
     
     int updateExternalStatus(String wxEnterpriseId , String externalUserid,int status) ;
+
+    /**
+     * 根据外部联系人id查询memberId
+     * @param wxEnterpriseId wx企业id
+     * @param externalUserId 外部联系人id(不区分自建和第三方)
+     * @return
+     */
+    com.gic.api.base.commons.ServiceResponse<String> getMemberIdByExternalId(String wxEnterpriseId,String externalUserId);
 }

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

@@ -422,4 +422,11 @@ public interface TabHaobanExternalClerkRelatedMapper {
 
     List<TabHaobanExternalClerkRelated> getAddTimeByMemberId(@Param("memberId") String memberId, @Param("enterpriseId") String enterpriseId);
 
+    /**
+     * 根据外部联系人id查询memberId
+     * @param wxEnterpriseId
+     * @param externalUserId
+     * @return
+     */
+    String getMemberIdByExternalId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("externalUserId") String externalUserId);
 }
\ No newline at end of file

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

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.service.service;
 import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
 import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
 import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Collection;
 import java.util.List;
@@ -114,4 +115,12 @@ public interface ExternalClerkRelatedService {
 	void deleteByWxEnterpriseId(String wxEnterpriseId,List<String> enterpriseIdList);
 	List<TabHaobanExternalClerkRelated> getAddTimeByMemberId(String memberId, String enterpriseId);
 
+	/**
+	 * 根据外部联系人id查询memberId
+	 * @param wxEnterpriseId
+	 * @param externalUserId
+	 * @return
+	 */
+	String getMemberIdByExternalId(String wxEnterpriseId,String externalUserId);
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/InteractRecordMessageBuilder.java

@@ -17,7 +17,7 @@ import com.gic.member.api.dto.info.MemberPersonalInfoDTO;
 import com.gic.member.api.dto.info.MemberSummaryInfoDTO;
 import com.gic.member.api.dto.info.qo.QueryMemberInfoDTO;
 import com.gic.member.api.service.MemberOutApiService;
-import com.gic.order.api.service.sharding.OrderApiService;
+import com.gic.order.api.service.member.MemberOrderReadApiService;
 import com.gic.orderecommerce.api.constant.OrderChannelEnum;
 import com.gic.orderecommerce.api.dto.MallEorderDTO;
 import com.gic.orderecommerce.api.service.EcommerceOrderOutputApiService;
@@ -58,7 +58,7 @@ public class InteractRecordMessageBuilder {
     @Autowired
     private EcommerceOrderOutputApiService ecommerceOrderOutputApiService;
     @Autowired
-    private OrderApiService orderApiService;
+    private MemberOrderReadApiService memberOrderReadApiService;
 
     /**
      * 计算互动记录的访问次数
@@ -153,8 +153,8 @@ public class InteractRecordMessageBuilder {
      * @return
      */
     public boolean queryMemberHasOrder(String memberId, String enterpriseId) {
-        Integer countOfSale = orderApiService.getCountOfSale(memberId, enterpriseId);
-        if (countOfSale != null && countOfSale > 0) {
+        ServiceResponse<Integer> response = memberOrderReadApiService.countByMember(enterpriseId, memberId, null);
+        if (null != response && response.getResult() != null && response.getResult() > 0) {
             return true;
         }
         for (OrderChannelEnum value : OrderChannelEnum.values()) {

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

@@ -547,4 +547,9 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
     public List<TabHaobanExternalClerkRelated> getAddTimeByMemberId(String memberId, String enterpriseId) {
         return this.mapper.getAddTimeByMemberId(memberId,enterpriseId);
     }
+
+    @Override
+    public String getMemberIdByExternalId(String wxEnterpriseId, String externalUserId) {
+        return this.mapper.getMemberIdByExternalId(wxEnterpriseId,externalUserId);
+    }
 }

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

@@ -30,6 +30,7 @@ import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.entity.ext.MemberStaffRelExtDO;
 import com.gic.haoban.manage.service.pojo.QywxTagSyncInfoPojo;
+import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.service.hm.WxUserAddLogService;
 import com.gic.member.api.dto.MemberDTO;
@@ -94,6 +95,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     private ClerkService clerkService;
     @Autowired
     private MemberService memberService;
+    @Autowired
+    private ExternalClerkRelatedService externalClerkRelatedService;
 
     /**
      * 查询会员在企业下的好友关系
@@ -774,4 +777,9 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     public int updateExternalStatus(String wxEnterpriseId, String externalUserid,int status) {
         return this.tabHaobanExternalClerkRelatedMapper.updateExternalStatus(wxEnterpriseId,externalUserid,status);
     }
+
+    @Override
+    public com.gic.api.base.commons.ServiceResponse<String> getMemberIdByExternalId(String wxEnterpriseId, String externalUserId) {
+        return com.gic.api.base.commons.ServiceResponse.success(externalClerkRelatedService.getMemberIdByExternalId(wxEnterpriseId,externalUserId));
+    }
 }

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

@@ -231,5 +231,6 @@
 
     <dubbo:service interface="com.gic.haoban.manage.api.service.content.task.CommissionTaskApiService"
                    ref="commissionTaskApiService" timeout="10000" />
+    <dubbo:reference id="memberOrderReadApiService" interface="com.gic.order.api.service.member.MemberOrderReadApiService" timeout="10000" retries="0" check="false" />
 
 </beans>
\ No newline at end of file

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

@@ -859,4 +859,11 @@
           AND enterprise_id = #{enterpriseId}
     </select>
 
+    <select id="getMemberIdByExternalId"  resultType="java.lang.String">
+        select member_id
+        from tab_haoban_external_clerk_related  where wx_enterprise_id = #{wxEnterpriseId}
+        and (external_user_id = #{externalUserId} or self_external_userid = #{externalUserId}) and status_flag =1
+        limit 1
+    </select>
+
 </mapper>
\ No newline at end of file