Merge branch 'feature-0808' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/qo/WelcomeRelationQO.java

@@ -2,6 +2,8 @@ package com.gic.haoban.manage.service.pojo.qo;
 
 import com.gic.haoban.base.api.common.BasePageInfo;
 
+import java.util.List;
+
 /**
  * @Author MUSI
  * @Date 2022/7/4 10:54 AM
@@ -17,6 +19,8 @@ public class WelcomeRelationQO extends BasePageInfo {
 
     private String searchContent;
 
+    private List<Integer> statusList;
+
     public String getWelcomeId() {
         return welcomeId;
     }
@@ -40,4 +44,12 @@ public class WelcomeRelationQO extends BasePageInfo {
     public void setSearchContent(String searchContent) {
         this.searchContent = searchContent;
     }
+
+    public List<Integer> getStatusList() {
+        return statusList;
+    }
+
+    public void setStatusList(List<Integer> statusList) {
+        this.statusList = statusList;
+    }
 }

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

@@ -161,7 +161,10 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService {
                 return Boolean.TRUE;
             }
             welcomeTemplateRelation.setUpdateTime(new Date());
-            welcomeTemplateRelation.setStatus(WelcomeRelationStatusEnum.DISABLE.getCode());
+            welcomeTemplateRelation.setStatus(hmWelcomeRelationBO.getStatus());
+            if (welcomeTemplateRelation.getStatus() == null){
+                welcomeTemplateRelation.setStatus(WelcomeRelationStatusEnum.DISABLE.getCode());
+            }
             welcomeTemplateRelationMapper.updateByPrimaryKeySelective(welcomeTemplateRelation);
 
             // 定义

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

@@ -142,48 +142,23 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
             return null;
         }
         List<StaffClerkInfoDTO> infoDTOS = EntityUtil.changeEntityListByJSON(StaffClerkInfoDTO.class, list);
-        Map<String, String> nameMap = new HashMap<>();
+
         infoDTOS.forEach(infoDTO -> {
-            //企业
-            if (!nameMap.containsKey(infoDTO.getEnterpriseId())) {
-                EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(infoDTO.getEnterpriseId());
-                if (null != enterpriseDTO) {
-                    nameMap.put(infoDTO.getEnterpriseId(), enterpriseDTO.getEnterpriseName() + "_" + enterpriseDTO.getBrandName());
-                } else {
-                    nameMap.put(infoDTO.getEnterpriseId(), "未知商户");
-                }
-            }
-            //门店店员名称
-            if (!nameMap.containsKey(infoDTO.getClerkId())) {
-                ClerkDTO clerkDTO = clerkService.getClerkByClerkId(infoDTO.getClerkId());
-                if (null != clerkDTO) {
-                    nameMap.put(infoDTO.getClerkId(), clerkDTO.getClerkName());
-                    nameMap.put(infoDTO.getStoreId(), clerkDTO.getStoreName());
-                    infoDTO.setClerkPhoneNumber(clerkDTO.getPhoneNumber());
-                } else {
-                    nameMap.put(infoDTO.getClerkId(), "未知店员");
-                }
+            EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(infoDTO.getEnterpriseId());
+            if (enterpriseDTO != null) {
+                infoDTO.setBrandName(enterpriseDTO.getBrandName());
+                infoDTO.setEnterpriseName(enterpriseDTO.getEnterpriseName());
             }
-
-            //门店店员名称
-            if (!nameMap.containsKey(infoDTO.getStoreId())) {
-                StoreDTO storeDTO = storeService.getStore(infoDTO.getStoreId());
-                if (null != storeDTO) {
-                    nameMap.put(infoDTO.getStoreId(), storeDTO.getStoreName());
-                } else {
-                    nameMap.put(infoDTO.getStoreId(), "未知门店");
-                }
+            ClerkDTO clerkDTO = clerkService.getClerkByClerkId(infoDTO.getClerkId());
+            if (null != clerkDTO) {
+                infoDTO.setClerkPhoneNumber(clerkDTO.getPhoneNumber());
+                infoDTO.setClerkName(clerkDTO.getClerkName());
+                infoDTO.setClerkCode(clerkDTO.getClerkCode());
             }
 
-            infoDTO.setClerkName(nameMap.get(infoDTO.getClerkId()));
-            infoDTO.setStoreName(nameMap.get(infoDTO.getStoreId()));
-            if ((nameMap.get(infoDTO.getEnterpriseId())) != null) {
-                String enterpriseAndBrandName = nameMap.get(infoDTO.getEnterpriseId());
-                String[] split = enterpriseAndBrandName.split("_");
-                infoDTO.setEnterpriseName(split[0]);
-                if (split[1] != null) {
-                    infoDTO.setBrandName(split[1]);
-                }
+            StoreDTO storeDTO = storeService.getStore(infoDTO.getStoreId());
+            if (null != storeDTO) {
+                infoDTO.setStoreName(storeDTO.getStoreName());
             }
         });
         return infoDTOS;

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

@@ -24,6 +24,7 @@ import com.gic.haoban.manage.api.dto.qdto.hm.HmClerkRelationQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeListQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
+import com.gic.haoban.manage.api.enums.WelcomeRelationStatusEnum;
 import com.gic.haoban.manage.api.enums.hm.HmWelcomeReferType;
 import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
 import com.gic.haoban.manage.service.config.Config;
@@ -162,7 +163,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         int saveResult = hmQrcodeService.insert(hmQrcodeQDTO);
         if (saveResult == 1) {
             // save welcome relation
-            this.updateWelcomeRelation(hmQrcodeQDTO);
+            this.updateWelcomeRelation(hmQrcodeQDTO, null);
         }
 
         return ServiceResponse.success();
@@ -310,11 +311,19 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
 
         //操作日志
         updateSystemLog(hmQrcodeQDTO, hmId);
-
+        String welcomeId = hmQrcodeQDTO.getWelcomeId();
+        if (StringUtils.isBlank(welcomeId)){
+            hmQrcodeQDTO.setWelcomeId("");
+        }
+        String memberLabelId = hmQrcodeQDTO.getMemberLabelId();
+        if (StringUtils.isBlank(memberLabelId)){
+            hmQrcodeQDTO.setMemberLabelId("");
+        }
         int updateResult = hmQrcodeService.update(hmQrcodeQDTO);
         if (updateResult == 1) {
             // 更新欢迎语引用次数
-            this.updateWelcomeRelation(hmQrcodeQDTO);
+            hmQrcodeQDTO.setHmCode(hmQrcodeBO.getHmCode());
+            this.updateWelcomeRelation(hmQrcodeQDTO, null);
         }
         return ServiceResponse.success();
     }
@@ -423,7 +432,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
      *
      * @param hmQrcodeQDTO
      */
-    private void updateWelcomeRelation(HmQrcodeQDTO hmQrcodeQDTO) {
+    private void updateWelcomeRelation(HmQrcodeQDTO hmQrcodeQDTO, Integer status) {
         HmWelcomeRelationBO welcomeRelationBo = new HmWelcomeRelationBO();
         welcomeRelationBo.setEnterpriseId(hmQrcodeQDTO.getEnterpriseId());
         welcomeRelationBo.setWxEnterpriseId(hmQrcodeQDTO.getWxEnterpriseId());
@@ -432,6 +441,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         welcomeRelationBo.setReferCode(hmQrcodeQDTO.getHmCode());
         welcomeRelationBo.setReferName(hmQrcodeQDTO.getName());
         welcomeRelationBo.setType(HmWelcomeReferType.HM.getCode());
+        welcomeRelationBo.setStatus(status);
         welcomeRelationService.updateWelcomeRelation(welcomeRelationBo);
     }
 
@@ -645,6 +655,9 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         }
         GicLogRecordEvaluationContext.putAttribute("logContent", logContent);
         hmQrcodeService.deleteById(hmId);
+        HmQrcodeQDTO hmQrcodeQDTO = new HmQrcodeQDTO();
+        hmQrcodeQDTO.setHmId(hmId);
+        this.updateWelcomeRelation(hmQrcodeQDTO, WelcomeRelationStatusEnum.DEPRECATED.getCode());
         return ServiceResponse.success();
     }
 

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

@@ -7,13 +7,18 @@ import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.hm.HmWelcomeRelationDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeRelationQDTO;
 import com.gic.haoban.manage.api.enums.WelcomeRelationStatusEnum;
+import com.gic.haoban.manage.api.enums.hm.HmWelcomeReferType;
 import com.gic.haoban.manage.api.service.hm.HmWelcomeRelationApiService;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
 import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
 import com.gic.haoban.manage.service.service.hm.WelcomeRelationService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * @Author MUSI
  * @Date 2022/7/4 10:52 AM
@@ -39,12 +44,22 @@ public class HmWelcomeRelationApiServiceImpl implements HmWelcomeRelationApiServ
         }
         WelcomeRelationQO welcomeRelationQo = new WelcomeRelationQO();
         welcomeRelationQo.setWelcomeId(queryWelcomeRelationQdto.getWelcomeId());
-        welcomeRelationQo.setStatus(WelcomeRelationStatusEnum.ENABLE.getCode());
+        welcomeRelationQo.setStatusList(Arrays.asList(WelcomeRelationStatusEnum.ENABLE.getCode(), WelcomeRelationStatusEnum.DEPRECATED.getCode()));
         welcomeRelationQo.setSearchContent(queryWelcomeRelationQdto.getSearchContent());
         welcomeRelationQo.setPageNum(queryWelcomeRelationQdto.getPageNum());
         welcomeRelationQo.setPageSize(queryWelcomeRelationQdto.getPageSize());
         Page<HmWelcomeRelationBO> welcomeRelationPage = welcomeRelationService.queryWelcomeRelationPage(welcomeRelationQo);
         Page<HmWelcomeRelationDTO> welcomeRelationDTOPage = PageUtil.changeToCurrentPage(welcomeRelationPage, HmWelcomeRelationDTO.class);
+        List<HmWelcomeRelationDTO> result = welcomeRelationDTOPage.getResult();
+        if (!CollectionUtils.isEmpty(result)){
+            for (HmWelcomeRelationDTO welcomeRelationBO : result) {
+                if (HmWelcomeReferType.LINK.getCode().equals(welcomeRelationBO.getType())){
+                    // 链接状态不展示
+                    welcomeRelationBO.setStatus(null);
+                }
+            }
+        }
+        welcomeRelationDTOPage.setResult(result);
         return ServiceResponse.success(welcomeRelationDTOPage);
     }
 }

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

@@ -180,6 +180,12 @@
             <if test="searchContent != null and searchContent != ''">
                 and (refer_code = #{searchContent} or refer_name like CONCAT('%', #{searchContent}, '%') )
             </if>
+            <if test="statusList != null and statusList.size > 0">
+                and `status` in
+                <foreach collection="statusList" item="status" open="(" close=")" separator=",">
+                    #{status}
+                </foreach>
+            </if>
         </where>
     </select>
 

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

@@ -177,13 +177,13 @@
             <if test="updateTime != null">
                 update_time = #{updateTime},
             </if>
-            <if test="memberLabelId != null and memberLabelId != ''">
+            <if test="memberLabelId != null">
                 member_label_id = #{memberLabelId},
             </if>
             <if test="passFlag != null">
                 pass_flag = #{passFlag},
             </if>
-            <if test="welcomeId != null and welcomeId != ''">
+            <if test="welcomeId != null">
                 welcome_id = #{welcomeId},
             </if>
             <if test="statusFlag != null">

haoban-manage3-service/src/test/java/HmPageServiceTest.java

@@ -129,7 +129,7 @@ public class HmPageServiceTest {
     @Test
     public void welcomeTest(){
         QueryWelcomeRelationQDTO qdto = new QueryWelcomeRelationQDTO();
-        qdto.setWelcomeId("04af9e55515d4352be0b2a3119005ce9");
+        qdto.setWelcomeId("7f12bdab4fb543e8977f96e30fc8eddb");
         //qdto.setSearchContent("测试");
         ServiceResponse<Page<HmWelcomeRelationDTO>> serviceResponse = welcomeRelationApiService.queryWelcomeRelation(qdto);
         System.out.println(JSON.toJSONString(serviceResponse));