Merge remote-tracking branch 'origin/master' into bugfix/2023-07-25

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/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-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;
+
 }