Merge remote-tracking branch 'origin/bugfix/2023-08-01' into 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/StaffMapper.java

@@ -187,5 +187,7 @@ public interface StaffMapper {
      * @return
      */
     List<String> queryStaffIdsWithEnterpriseId(@Param("wxEnterpriseIds") List<String> wxEnterpriseIds);
+
+    Integer getNumByActiveCode(@Param("wxEnterpriseId") String wxEnterpriseId,@Param("activeCode")String activeCode);
     
 }
\ No newline at end of file

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/dao/mapper/hm/TabHaobanHmQrcodeMapper.java

@@ -134,6 +134,17 @@ public interface TabHaobanHmQrcodeMapper {
                                                 @Param("hmType") Integer hmType);
 
     /**
+     *
+     * @param staffId
+     * @param wxEnterpriseId
+     * @param hmType
+     * @return
+     */
+    List<Long> queryByStaffIdAndOverFlag(@Param("staffId") String staffId,
+                                           @Param("wxEnterpriseId") String wxEnterpriseId,
+                                           @Param("hmType") Integer hmType);
+
+    /**
      * 活码门店ids
      *
      * @param enterpriseId 企业标识

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/InteractRecordBuilder.java

@@ -11,8 +11,8 @@ import com.gic.haoban.manage.service.pojo.bo.content.InteractRecordBO;
 import com.gic.haoban.manage.service.pojo.bo.content.InteractRecordExtendInfoBO;
 import com.gic.haoban.manage.service.pojo.bo.content.PotentialCustomerBO;
 import com.gic.haoban.manage.service.pojo.bo.content.context.InteractRecordMessageContext;
-import com.gic.store.goods.dto.goods.mall.MallGoodsInfoDTO;
-import com.gic.store.goods.dto.qdto.mall.MallGoodsListQDTO;
+import com.gic.store.goods.dto.goods.GoodsSpuInfoDTO;
+import com.gic.store.goods.dto.qdto.GoodsListQDTO;
 import com.gic.store.goods.service.GoodsCenterApiService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -117,12 +117,13 @@ public class InteractRecordBuilder {
         if (CollectionUtils.isEmpty(visitGoodsIds)) {
             return Collections.emptyList();
         }
-        MallGoodsListQDTO goodsListQDTO = new MallGoodsListQDTO();
+        GoodsListQDTO goodsListQDTO = new GoodsListQDTO();
         goodsListQDTO.setEnterpriseId(enterpriseId);
         goodsListQDTO.setIncludeGoodsIds(visitGoodsIds);
         goodsListQDTO.setPageSize(visitGoodsIds.size() + 1);
-        // 0删除 1仓库 2上架 3回收站
-        ServiceResponse<Page<MallGoodsInfoDTO>> serviceResponse = goodsCenterApiService.queryMallGoodsList(goodsListQDTO);
+        ServiceResponse<Page<GoodsSpuInfoDTO>> serviceResponse =
+                goodsCenterApiService.queryStoreGoodsList(goodsListQDTO);
+        // 1:已上线，2:未上线，3:回收站
         if (!serviceResponse.isSuccess()) {
             log.info("查询商品异常 {}", JSON.toJSONString(serviceResponse));
             return Collections.emptyList();

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

@@ -210,4 +210,5 @@ public interface HmQrcodeService {
     void updateClerkInfo(Long hmId,String newClerkId);
     
     String getClerkQrcode( String enterpriseId, String clerkId);
+    List<Long> queryByStaffIdAndOverFlag(String staffId, String wxEnterpriseId, Integer hmType);
 }

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

@@ -226,4 +226,9 @@ public class HmQrcodeServiceImpl implements HmQrcodeService {
     public String getClerkQrcode(String enterpriseId, String clerkId) {
         return this.tabHaobanHmQrcodeMapper.getClerkQrcode(enterpriseId, clerkId);
     }
+
+    @Override
+    public List<Long> queryByStaffIdAndOverFlag(String staffId, String wxEnterpriseId, Integer hmType) {
+        return this.tabHaobanHmQrcodeMapper.queryByStaffIdAndOverFlag(staffId,wxEnterpriseId,hmType);
+    }
 }

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/impl/StaffClerkRelationServiceImpl.java

@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.gic.commons.util.DateUtil;
 import com.gic.haoban.manage.service.entity.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -520,7 +521,10 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
                 }
             }
             if(delFlag) {
-                this.mapper.delByClerkId(clerkId);
+                Date time = DateUtil.addDay(new Date(),-1);
+                if (null != clerk && clerk.getUpdateTime().before(time)){
+                    this.mapper.delByClerkId(clerkId);
+                }
             }else {
                 retList.add(item) ;
             }
@@ -545,7 +549,10 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
             }
         }
         if(delFlag) {
-            this.mapper.delByClerkId(clerkId);
+            Date time = DateUtil.addDay(new Date(),-1);
+            if (null != clerk && clerk.getUpdateTime().before(time)){
+                this.mapper.delByClerkId(clerkId);
+            }
             dto = null ;
         }
         return dto ;

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

@@ -158,9 +158,9 @@ public class WelcomeSendServiceImpl implements WelcomeSendService {
         String content = welcomeBO.getWelcomeContent();
         if (content.contains("<微信昵称>")) {
             String nickName = this.getExternalUserName(qwDTO, externalUserId);
-            nickName = nickName.replaceAll("\\$","RDS_CHAR_DOLLAR");// encode replacement;
+            //这里对“$”符号和”\\“符号进行转移处理
+            nickName = java.util.regex.Matcher.quoteReplacement(nickName);
             content = content.replaceAll("<微信昵称>", nickName);
-            content = content.replaceAll("RDS_CHAR_DOLLAR","\\$");// decode replacement;
         }
         QywxWelcomeMsgDTO qywxWelcomeMsgDTO = new QywxWelcomeMsgDTO();
         // 欢迎语内容

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/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -705,7 +705,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String clerkId = staffClerkRelationDTO.getClerkId();
         String clerkCode = staffClerkRelationDTO.getClerkCode();
         String enterpriseId = staffClerkRelationDTO.getEnterpriseId();
-        ClerkDTO clerk = clerkService.getClerkByClerkCode(enterpriseId, clerkCode);
+        //统一根据导购id查询
+        ClerkDTO clerk = clerkService.getClerkByClerkId(clerkId);
         log.info("【新增外部联系人】创建member,clerkCode={},unionid:{}", clerkCode, unionId);
         if (clerk == null) {
             log.info("【新增外部联系人】创建member,导购为空返回:{}", clerkCode);
@@ -1850,14 +1851,14 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             log.info("好友不同开平：{}", JSONObject.toJSONString(externalUserDTO));
             return this.saveExternalUser(externalUserDTO);
         }
-        String clerkCode = staffClerkRelationDTO.getClerkCode();
-        ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), clerkCode);
+        //统一根据导购id查询
+        ClerkDTO clerk = clerkService.getClerkByClerkId(clerkId);
         if (clerk == null) {
-            return "导购不存在:" + clerkCode;
+            return "导购不存在:" + clerkId;
         }
         String qrcodeParam = clerk.getQrcodeParam();
         if (StringUtils.isBlank(qrcodeParam)) {
-            log.info("导购码不存在：" + clerkCode);
+            log.info("导购码不存在：" + clerkId);
             qrcodeParam = "clerk_clerk_"+clerk.getClerkId() ;
         }
         String memberId  = this.getMeberId(enterpriseId, externalUserDTO.getUnionId(), externalUserDTO.getName(), externalUserDTO.getAvatar(), qrcodeParam, externalUserDTO.getExternalUserId(), wxEnterpriseRelated.getWxEnterpriseType(), 1) ;

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

@@ -12,8 +12,11 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollUtil;
 import com.gic.business.order.dto.ordermanage.OrderInfoDTO;
 import com.gic.business.order.service.ordermanage.WebOrderManageApiService;
+import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
+import com.gic.haoban.manage.service.service.hm.HmQrcodeService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -134,6 +137,10 @@ public class MessageApiServiceImpl implements MessageApiService {
     private MemberQueryService memberQueryService ;
     @Autowired
     private WebOrderManageApiService webOrderManageApiService ;
+    @Autowired
+    private HmQrcodeService hmQrcodeService;
+    @Autowired
+    private HmQrcodeApiService hmQrcodeApiService;
 
 
     @Override
@@ -387,6 +394,13 @@ public class MessageApiServiceImpl implements MessageApiService {
             this.groupChatService.ownerDimission(staffId);
             // 删除员工表-注意顺序
             this.staffService.delByStaffId(staffId);
+            //活码删除
+            List<Long> hmIdList = hmQrcodeService.queryByStaffIdAndOverFlag(staffId, wxEnterpriseId, 1);
+            if(CollUtil.isNotEmpty(hmIdList)){
+                for (Long hmId : hmIdList){
+                    hmQrcodeApiService.delById(hmId,ChannelCodeEnum.ADMIN_UNBIND.getCode(),null);
+                }
+            }
         }
         log.error("成员同步结束");
     }

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

@@ -1189,19 +1189,23 @@ public class StaffApiServiceImpl implements StaffApiService {
             if (null == activeDataDTO){
                 logger.info("查询不到企业微信id->{}的许可账号统计信息！",wxEnterprise.getWxEnterpriseId());
             }else {
-                //已使用的加1，已激活的加1，未激活的减1
-                Integer used = activeDataDTO.getUsed();
-                Integer inactive = activeDataDTO.getInactive();
-                Integer activated = activeDataDTO.getActivated();
-                used++;
-                activated++;
-                if(null != inactive && inactive > 0){
-                    inactive--;
+                //需要区分激活码，待转移状态的激活码不需要处理
+                Integer num = staffMapper.getNumByActiveCode(wxEnterprise.getWxEnterpriseId(), activeCode);
+                if (num==0){
+                    //已使用的加1，已激活的加1，未激活的减1
+                    Integer used = activeDataDTO.getUsed();
+                    Integer inactive = activeDataDTO.getInactive();
+                    Integer activated = activeDataDTO.getActivated();
+                    used++;
+                    activated++;
+                    if(null != inactive && inactive > 0){
+                        inactive--;
+                    }
+                    activeDataDTO.setUsed(used);
+                    activeDataDTO.setInactive(inactive);
+                    activeDataDTO.setActivated(activated);
+                    wxEnterpriseActiveDataService.updateByStaffActiveDataDTO(activeDataDTO);
                 }
-                activeDataDTO.setUsed(used);
-                activeDataDTO.setInactive(inactive);
-                activeDataDTO.setActivated(activated);
-                wxEnterpriseActiveDataService.updateByStaffActiveDataDTO(activeDataDTO);
             }
         }
         return com.gic.api.base.commons.ServiceResponse.success(true);

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

@@ -256,6 +256,7 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
                 if (resp.isSuccess()) {
                     EnterpriseUsingPermissionDto dto = resp.getResult();
                     Date endDate = dto.getServiceEndDate();
+                    logger.info("查询企业到期时间,gic企业id：{}，时间：{}",a.getEnterpriseId(),DateUtil.dateToStr(endDate,DateUtil.FORMAT_DATETIME_19));
                     if (endTime.before(endDate)) {
                         endTime = endDate;
                     }
@@ -267,10 +268,10 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
         qdto.setPageSize(10000);
         Page<AppOrderPageDTO> page = this.getAppOrderPage(qdto).getResult();
         List<AppOrderPageDTO> list = page.getResult();
+        Boolean flag = false;
         if (CollUtil.isNotEmpty(list)) {
             Date beginTime = new Date();
             Integer num = 0;
-            Boolean flag = false;
             for (AppOrderPageDTO dto : list) {
                 if (dto.getOrderStatus() == 2 ){
                     num += dto.getUserNum();
@@ -299,6 +300,10 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
         } else {
             result.setType(0);
         }
+        if (!flag){
+            appOrderEndTime = now;
+        }
+        logger.info("已购买付费应用的到期时间:{},合同到期时间：{}",DateUtil.dateToStr(appOrderEndTime,DateUtil.FORMAT_DATETIME_19),DateUtil.dateToStr(endTime,DateUtil.FORMAT_DATETIME_19));
         int i = DateUtil.daysBetween(appOrderEndTime, endTime);
         if(i< 0){
             i = 0;

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

@@ -646,5 +646,8 @@
               #{wxEnterpriseId}
           </foreach>
     </select>
+    <select id="getNumByActiveCode" resultType="java.lang.Integer">
+        SELECT count(*) FROM tab_haoban_staff WHERE  wx_enterprise_id = #{wxEnterpriseId} and active_code = #{activeCode}
+    </select>
 
 </mapper>
\ 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

haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmQrcodeMapper.xml

@@ -262,6 +262,19 @@
         limit 1
     </select>
 
+    <select id="queryByStaffIdAndOverFlag" resultType="Long">
+        select
+        hm_id as hmId
+        from tab_haoban_hm_qrcode
+        where staff_id = #{staffId} and status_flag = 1
+        <if test="null != wxEnterpriseId">
+            and wx_enterprise_id = #{wxEnterpriseId}
+        </if>
+        <if test="hmType != null">
+            and hm_type = #{hmType}
+        </if>
+    </select>
+
 
     <select id="getHmStoreByEnterpriseId" resultMap="TabHaobanHmQrcodeMap">
         select store_id storeId,

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/MaidianLogController.java

 package com.gic.haoban.manage.web.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
@@ -47,7 +48,8 @@ public class MaidianLogController extends WebBaseController {
             }
             StoreDTO store = storeService.getStore(maidianLogDTO.getStoreId());
             if (store != null) {
-                com.gic.clerk.api.dto.ClerkDTO clerkDTO = clerkService.getClerkByClerkCode(store.getEnterpriseId(), maidianLogDTO.getClerkCode());
+                //统一根据导购id查询
+                ClerkDTO clerkDTO = clerkService.getClerkByClerkId(maidianLogDTO.getClerkId());
                 maidianLogDTO.setEnterpriseId(store.getEnterpriseId());
                 if (clerkDTO != null) {
                     //导购变更门店

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java

@@ -114,7 +114,8 @@ public class StoreController extends WebBaseController {
                 logger.info("非当前商户,直接跳过={},{}", gicEnterpriseId, enterpriseId);
                 continue;
             }
-            ClerkDTO clerk = clerkService.getClerkByClerkCode(enterpriseId, staffClerkRelationDTO.getClerkCode());
+            //统一根据导购id查询
+            ClerkDTO clerk = clerkService.getClerkByClerkId(staffClerkRelationDTO.getClerkId());
             if (clerk == null) {
                 continue;
             }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java

@@ -234,7 +234,7 @@ public class WxStaffController extends WebBaseController {
         List<StaffClerkRelationDTO> bindRelationList = staffClerkRelationApiService.listBindCode(wxEnterpriseId,
                 enterpriseId, clerkCodeList);
         Map<String, StaffClerkRelationDTO> bindCodeMap = bindRelationList.stream()
-                .collect(Collectors.toMap(StaffClerkRelationDTO::getClerkCode, s -> s));
+                .collect(Collectors.toMap(StaffClerkRelationDTO::getClerkId, s -> s));
         List<StoreClerkVO> resultList = new ArrayList<>();
         for (ClerkDTO dto : clerkDTOS) {
             String clerkCode = dto.getClerkCode();
@@ -244,7 +244,7 @@ public class WxStaffController extends WebBaseController {
             vo.setClerkType(dto.getClerkType());
             vo.setClerkImg(dto.getImageUrl());
             vo.setClerkName(dto.getClerkName());
-            StaffClerkRelationDTO related = bindCodeMap.get(clerkCode);
+            StaffClerkRelationDTO related = bindCodeMap.get(dto.getClerkId());
             if (related != null) {
                 vo.setStaffId(related.getStaffId());
                 vo.setBindFlag(1);
@@ -1097,13 +1097,13 @@ public class WxStaffController extends WebBaseController {
         List<StaffClerkRelationDTO> bindRelationList = staffClerkRelationApiService.listBindCode(wxEnterpriseId,
                 enterpriseId, clerkCodeList);
         Map<String, StaffClerkRelationDTO> bindCodeMap = bindRelationList.stream()
-                .collect(Collectors.toMap(StaffClerkRelationDTO::getClerkCode, s -> s));
+                .collect(Collectors.toMap(StaffClerkRelationDTO::getClerkId, s -> s));
         List<BindClerkVO> bindList = new ArrayList<>();
         List<BindClerkVO> unBindList = new ArrayList<>();
         for (ClerkDTO dto : list) {
             BindClerkVO vo = EntityUtil.changeEntityNew(BindClerkVO.class, dto);
-            if (bindCodeMap.containsKey(dto.getClerkCode())) {
-                String staffId = bindCodeMap.get(dto.getClerkCode()).getStaffId();
+            if (bindCodeMap.containsKey(dto.getClerkId())) {
+                String staffId = bindCodeMap.get(dto.getClerkId()).getStaffId();
                 StaffDTO staffDTO = staffApiService.selectById(staffId);
                 vo.setStaffId(staffId);
                 String phoneNumber = dto.getPhoneNumber();
@@ -1146,13 +1146,13 @@ public class WxStaffController extends WebBaseController {
         List<StaffClerkRelationDTO> bindRelationList = staffClerkRelationApiService.listBindCode(wxEnterpriseId,
                 enterpriseId, clerkCodeList);
         Map<String, StaffClerkRelationDTO> bindCodeMap = bindRelationList.stream()
-                .collect(Collectors.toMap(StaffClerkRelationDTO::getClerkCode, s -> s));
+                .collect(Collectors.toMap(StaffClerkRelationDTO::getClerkId, s -> s));
         List<BindClerkVO> bindList = new ArrayList<>();
         List<BindClerkVO> unBindList = new ArrayList<>();
         for (ClerkDTO dto : list) {
             BindClerkVO vo = EntityUtil.changeEntityByJSON(BindClerkVO.class, dto);
-            if (bindCodeMap.containsKey(dto.getClerkCode())) {
-                String staffId = bindCodeMap.get(dto.getClerkCode()).getStaffId();
+            if (bindCodeMap.containsKey(dto.getClerkId())) {
+                String staffId = bindCodeMap.get(dto.getClerkId()).getStaffId();
                 StaffDTO staffDTO = staffApiService.selectById(staffId);
                 vo.setStaffId(staffId);
                 vo.setNationCode(dto.getNationcode());
@@ -1193,8 +1193,8 @@ public class WxStaffController extends WebBaseController {
                 staffId);
         String storeId = mainDTO == null ? "" : mainDTO.getStoreId();
         for (StaffClerkRelationDTO staffClerkRelationDTO : bindRelationList) {
-            ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(),
-                    staffClerkRelationDTO.getClerkCode());
+            //统一根据导购id查询
+            ClerkDTO clerk = clerkService.getClerkByClerkId(staffClerkRelationDTO.getClerkId());
             if (clerk != null) {
                 StoreDTO store = storeService.getStore(clerk.getStoreId());
                 // 主门店标志
@@ -1606,7 +1606,8 @@ public class WxStaffController extends WebBaseController {
                 logger.info("非当前商户,直接跳过={},{}", gicEnterpriseId, enterpriseId);
                 continue;
             }
-            ClerkDTO clerk = clerkService.getClerkByClerkCode(enterpriseId, staffClerkRelationDTO.getClerkCode());
+            //统一根据导购id查询
+            ClerkDTO clerk = clerkService.getClerkByClerkId(staffClerkRelationDTO.getClerkId());
             if (clerk == null) {
                 continue;
             }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/goods/GoodsInfoAdaptor.java

@@ -47,8 +47,6 @@ public class GoodsInfoAdaptor {
         GoodsListQDTO searchQdto = new GoodsListQDTO();
         searchQdto.setEnterpriseId(enterpriseId);
         searchQdto.setGoodsNameText(search);
-        // 只查询ERP的
-        searchQdto.setSourceType(1);
         searchQdto.setPageNum(1);
         searchQdto.setPageSize(1000);
         ServiceResponse<Page<GoodsSpuInfoDTO>> serviceResponse = goodsInfoOutApiService.queryGoodsInfoList(searchQdto);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/ContentMaterialInfoVO.java

@@ -99,6 +99,13 @@ public class ContentMaterialInfoVO implements Serializable {
     private Integer duration;
 
 
+    /**
+     * 商品来源
+     * @see com.gic.store.goods.enums.GoodsSourceTypeEnum
+     */
+    private Integer sourceType;
+
+
     public Long getContentMaterialId() {
         return contentMaterialId;
     }
@@ -226,4 +233,12 @@ public class ContentMaterialInfoVO implements Serializable {
     public void setDuration(Integer duration) {
         this.duration = duration;
     }
+
+    public Integer getSourceType() {
+        return sourceType;
+    }
+
+    public void setSourceType(Integer sourceType) {
+        this.sourceType = sourceType;
+    }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/SimpleGoodsInfoVO.java

@@ -66,5 +66,11 @@ public class SimpleGoodsInfoVO implements Serializable {
      */
     private BigDecimal commission;
 
+    /**
+     * 商品来源
+     * @see com.gic.store.goods.enums.GoodsSourceTypeEnum
+     */
+    private Integer sourceType;
+
 }