feat: 命名统一规范

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmPageDTO.java

 package com.gic.haoban.manage.api.dto.hm;
 
-import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
-
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -10,7 +9,7 @@ import java.util.Date;
  * @Description
  * @Version
  **/
-public class HmPageDTO extends WebLoginDTO {
+public class HmPageDTO implements Serializable {
 
     private static final long serialVersionUID = 8049920392780217427L;
 
@@ -161,22 +160,18 @@ public class HmPageDTO extends WebLoginDTO {
         this.guideComment = guideComment;
     }
 
-    @Override
     public String getEnterpriseId() {
         return enterpriseId;
     }
 
-    @Override
     public void setEnterpriseId(String enterpriseId) {
         this.enterpriseId = enterpriseId;
     }
 
-    @Override
     public String getWxEnterpriseId() {
         return wxEnterpriseId;
     }
 
-    @Override
     public void setWxEnterpriseId(String wxEnterpriseId) {
         this.wxEnterpriseId = wxEnterpriseId;
     }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/welcome/dto/WelcomeRemoveDTO.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/welcome/dto/WelcomeRemoveCheckDTO.java

@@ -9,8 +9,9 @@ import java.io.Serializable;
  * @Version
  * 活码删除失败时返回对象
  **/
-public class WelcomeRemoveDTO implements Serializable {
+public class WelcomeRemoveCheckDTO implements Serializable {
 
+    private static final long serialVersionUID = 6300468958582699365L;
     /**
      * 活码引用数量
      */

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

@@ -5,7 +5,7 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.welcome.dto.FriendSettingDetailDTO;
 import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO;
 import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeListDTO;
-import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveDTO;
+import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveCheckDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.SaveFriendSettingQDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.SaveWelcomeQDTO;
@@ -123,6 +123,14 @@ public interface WelcomeApiService {
      * @param welcomeId
      * @return
      */
-    ServiceResponse<WelcomeRemoveDTO> removeWelcomeWithErrorInfo(String welcomeId);
+    ServiceResponse<WelcomeRemoveCheckDTO> removeWelcomeWithErrorInfo(String welcomeId);
+
+
+    /**
+     * 欢迎语被引用统计
+     * @param welcomeId
+     * @return
+     */
+    ServiceResponse<WelcomeRemoveCheckDTO> welcomeReferStatistics(String welcomeId);
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/hm/HmPageRelationBO.java

@@ -101,4 +101,12 @@ public class HmPageRelationBO implements Serializable {
     public void setType(Integer type) {
         this.type = type;
     }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
 }

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

@@ -10,8 +10,11 @@ import com.gic.haoban.base.api.common.BasePageInfo;
  **/
 public class WelcomeRelationQO extends BasePageInfo {
 
+    private static final long serialVersionUID = -2538708162030338593L;
     private String welcomeId ;
 
+    private Integer status;
+
     public String getWelcomeId() {
         return welcomeId;
     }
@@ -19,4 +22,12 @@ public class WelcomeRelationQO extends BasePageInfo {
     public void setWelcomeId(String welcomeId) {
         this.welcomeId = welcomeId;
     }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
 }

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

@@ -2,7 +2,7 @@ package com.gic.haoban.manage.service.service;
 
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
-import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveDTO;
+import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveCheckDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO;
 import com.gic.haoban.manage.service.pojo.bo.welcome.*;
 
@@ -142,5 +142,12 @@ public interface WelcomeService {
      * @param welcomeId
      * @return
      */
-    WelcomeRemoveDTO removeWithErrorInfo(String welcomeId);
+    WelcomeRemoveCheckDTO removeWithErrorInfo(String welcomeId);
+
+    /**
+     * 欢迎语引用情况统计
+     * @param welcomeId
+     * @return
+     */
+    WelcomeRemoveCheckDTO welcomeReferStatistics(String welcomeId);
 }

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

@@ -36,14 +36,14 @@ public interface HmPageRelationService {
      * @param pageCode
      * @return
      */
-    List<HmPageRelationBO> queryPageTemplateRelation(String pageCode);
+    List<HmPageRelationBO> queryPageRelation(String pageCode);
 
     /**
      * 链接code/模板名称 条件查询
-
+     * @param hmPageRelationQo
      * @return
      */
-    Page<HmPageRelationBO> queryPageTemplateRelationWithSearchText(HmPageRelationQO hmPageRelationQo);
+    Page<HmPageRelationBO> queryPageRelationWithSearchText(HmPageRelationQO hmPageRelationQo);
 
     /**
      * 统计templateCode 被引用的总数

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

@@ -58,7 +58,7 @@ public class HmPageRelationServiceImpl implements HmPageRelationService {
     }
 
     @Override
-    public List<HmPageRelationBO> queryPageTemplateRelation(String pageCode) {
+    public List<HmPageRelationBO> queryPageRelation(String pageCode) {
         HmPageRelationQO hmPageRelationQo = new HmPageRelationQO();
         hmPageRelationQo.setPageCode(pageCode);
         hmPageRelationQo.setStatus(HmPageStatus.ENABLE.getCode());
@@ -79,7 +79,7 @@ public class HmPageRelationServiceImpl implements HmPageRelationService {
      * @return
      */
     @Override
-    public Page<HmPageRelationBO> queryPageTemplateRelationWithSearchText(HmPageRelationQO hmPageRelationQo) {
+    public Page<HmPageRelationBO> queryPageRelationWithSearchText(HmPageRelationQO hmPageRelationQo) {
         PageHelper.startPage(hmPageRelationQo.getPageNum(), hmPageRelationQo.getPageSize());
         com.github.pagehelper.Page<TabHaobanHmPageRelation> pageRelationPage =
                 (com.github.pagehelper.Page<TabHaobanHmPageRelation>) haobanHmPageRelationMapper.queryPageRelationList(hmPageRelationQo);

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

@@ -88,8 +88,8 @@ public class HmPageServiceImpl implements HmPageService {
         tempHmPage.setPageId(pageDTO.getPageId());
         tempHmPage.setStatus(HmPageStatus.DISABLE.getCode());
         tempHmPage.setUpdateTime(new Date());
-        tempHmPage.setModifierId(pageDTO.getClerkId());
-        tempHmPage.setModifierName(pageDTO.getClerkName());
+        tempHmPage.setModifierId(pageDTO.getModifierId());
+        tempHmPage.setModifierName(pageDTO.getModifierName());
         log.info("[deleteHmPageTemplate] params:{}", JSON.toJSONString(tempHmPage));
         haobanHmPageMapper.updateByPrimaryKeySelective(tempHmPage);
     }
@@ -110,11 +110,11 @@ public class HmPageServiceImpl implements HmPageService {
             BeanUtils.copyProperties(pageDTO, haobanHmPage);
             haobanHmPage.setPageId(UniqueIdUtils.uniqueLong());
             haobanHmPage.setPageCode(this.generatorTemplateCode(haobanHmPage.getPageId()));
-            haobanHmPage.setCreateorId(pageDTO.getClerkId());
-            haobanHmPage.setCreateorName(pageDTO.getClerkName());
+            haobanHmPage.setCreateorId(pageDTO.getCreateorId());
+            haobanHmPage.setCreateorName(pageDTO.getCreateorName());
             haobanHmPage.setCreateTime(now);
-            haobanHmPage.setModifierId(pageDTO.getClerkId());
-            haobanHmPage.setModifierName(pageDTO.getClerkName());
+            haobanHmPage.setModifierId(pageDTO.getCreateorId());
+            haobanHmPage.setModifierName(pageDTO.getCreateorName());
             haobanHmPage.setUpdateTime(now);
             haobanHmPage.setStatus(HmPageStatus.ENABLE.getCode());
             haobanHmPageMapper.insertSelective(haobanHmPage);
@@ -126,8 +126,8 @@ public class HmPageServiceImpl implements HmPageService {
             haobanHmPage.setPageId(pageDTO.getPageId());
             haobanHmPage.setPageCode(null);
             haobanHmPage.setUpdateTime(now);
-            haobanHmPage.setModifierId(pageDTO.getClerkId());
-            haobanHmPage.setModifierName(pageDTO.getClerkName());
+            haobanHmPage.setModifierId(pageDTO.getModifierId());
+            haobanHmPage.setModifierName(pageDTO.getModifierName());
             haobanHmPageMapper.updateByPrimaryKeySelective(haobanHmPage);
             return haobanHmPage.getPageId();
         }

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

@@ -3,7 +3,7 @@ package com.gic.haoban.manage.service.service.impl;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.common.utils.StringUtil;
-import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveDTO;
+import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveCheckDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO;
 import com.gic.haoban.manage.api.enums.FriendSettingTypeEnum;
 import com.gic.haoban.manage.api.enums.WelcomeMediaTypeEnum;
@@ -13,7 +13,6 @@ import com.gic.haoban.manage.api.enums.hm.HmWelcomeReferType;
 import com.gic.haoban.manage.api.enums.hm.HmWelcomeType;
 import com.gic.haoban.manage.service.dao.mapper.*;
 import com.gic.haoban.manage.service.entity.*;
-import com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
 import com.gic.haoban.manage.service.pojo.bo.welcome.*;
 import com.gic.haoban.manage.service.pojo.qo.WelcomeInfoQO;
@@ -656,7 +655,7 @@ public class WelcomeServiceImpl implements WelcomeService {
      * 不可删除时 返回具体的关联数量
      */
     @Override
-    public WelcomeRemoveDTO removeWithErrorInfo(String welcomeId) {
+    public WelcomeRemoveCheckDTO removeWithErrorInfo(String welcomeId) {
         // 1、查询欢迎语
         // 2、根据欢迎语类型 区分
         // 3、特殊类型 查询欢迎语引用的数量
@@ -669,20 +668,37 @@ public class WelcomeServiceImpl implements WelcomeService {
             this.removeWelcome(welcomeId);
             return null;
         }
+
+        WelcomeRemoveCheckDTO welcomeRemoveCheckDTO = this.welcomeReferStatistics(welcomeId);
+        if (welcomeRemoveCheckDTO == null){
+            this.removeWelcome(welcomeId);
+            return null;
+        }
+        return welcomeRemoveCheckDTO;
+    }
+
+    /**
+     * 欢迎语引用情况统计
+     *
+     * @param welcomeId
+     * @return
+     */
+    @Override
+    public WelcomeRemoveCheckDTO welcomeReferStatistics(String welcomeId) {
         WelcomeRelationQO welcomeRelationQo = new WelcomeRelationQO();
         welcomeRelationQo.setWelcomeId(welcomeId);
+        welcomeRelationQo.setStatus(WelcomeRelationStatusEnum.ENABLE.getCode());
         List<HmWelcomeRelationBO> hmWelcomeRelationBos = welcomeRelationService.queryWelcomeRelationList(welcomeRelationQo);
         if (CollectionUtils.isEmpty(hmWelcomeRelationBos)){
-            this.removeWelcome(welcomeId);
             return null;
         }
         Map<Integer, List<HmWelcomeRelationBO>> welcomeGroupByType = hmWelcomeRelationBos.stream()
                 .collect(Collectors.groupingBy(HmWelcomeRelationBO::getType));
-        WelcomeRemoveDTO welcomeRemoveDTO = new WelcomeRemoveDTO();
-        welcomeRemoveDTO.setQrCodeReferNum(Optional.ofNullable(welcomeGroupByType.get(HmWelcomeReferType.HM.getCode()))
+        WelcomeRemoveCheckDTO welcomeRemoveCheckDTO = new WelcomeRemoveCheckDTO();
+        welcomeRemoveCheckDTO.setQrCodeReferNum(Optional.ofNullable(welcomeGroupByType.get(HmWelcomeReferType.HM.getCode()))
                 .map(List::size).orElse(0));
-        welcomeRemoveDTO.setLinkReferNum(Optional.ofNullable(welcomeGroupByType.get(HmWelcomeReferType.LINK.getCode()))
+        welcomeRemoveCheckDTO.setLinkReferNum(Optional.ofNullable(welcomeGroupByType.get(HmWelcomeReferType.LINK.getCode()))
                 .map(List::size).orElse(0));
-        return welcomeRemoveDTO;
+        return welcomeRemoveCheckDTO;
     }
 }

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

@@ -7,7 +7,7 @@ import com.gic.haoban.manage.api.dto.welcome.dto.FriendSettingDetailDTO;
 import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO;
 import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeListDTO;
 import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeMediaDTO;
-import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveDTO;
+import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveCheckDTO;
 import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeSuitDepartmentDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.SaveFriendSettingQDTO;
@@ -60,6 +60,7 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
         saveWelcomeBO.setCreatorName(qdto.getCreatorName());
         saveWelcomeBO.setModifierId(qdto.getModifierId());
         saveWelcomeBO.setModifierName(qdto.getModifierName());
+        saveWelcomeBO.setType(qdto.getType());
         // 媒体列表
         saveWelcomeBO.setWelcomeMediaList(EntityUtil.changeEntityListNew(SaveWelcomeMediaBO.class, qdto.getWelcomeMediaList()));
         // 适用部门新增列表
@@ -189,7 +190,18 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
      * @return
      */
     @Override
-    public ServiceResponse<WelcomeRemoveDTO> removeWelcomeWithErrorInfo(String welcomeId) {
+    public ServiceResponse<WelcomeRemoveCheckDTO> removeWelcomeWithErrorInfo(String welcomeId) {
         return ServiceResponse.success(welcomeService.removeWithErrorInfo(welcomeId));
     }
+
+    /**
+     * 欢迎语被引用统计
+     *
+     * @param welcomeId
+     * @return
+     */
+    @Override
+    public ServiceResponse<WelcomeRemoveCheckDTO> welcomeReferStatistics(String welcomeId) {
+        return ServiceResponse.success(welcomeService.welcomeReferStatistics(welcomeId));
+    }
 }

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

@@ -93,12 +93,12 @@ public class HmPageApiServiceImpl implements HmPageApiService {
     /**
      * 校验落地页模板pageTemplateCode 是否被关联
      *
-     * @param pageTemplateCode
+     * @param pageCode
      * @return true 存在关联
      * false 不存在关联关系
      */
-    private Integer checkPageIsBeQuoted(String pageTemplateCode) {
-        List<HmPageRelationBO> relations = pageRelationService.queryPageTemplateRelation(pageTemplateCode);
+    private Integer checkPageIsBeQuoted(String pageCode) {
+        List<HmPageRelationBO> relations = pageRelationService.queryPageRelation(pageCode);
         return 0;
     }
 
@@ -117,7 +117,8 @@ public class HmPageApiServiceImpl implements HmPageApiService {
         hmPageRelationQo.setPageNum(relationQueryDTO.getPageNum());
         hmPageRelationQo.setPageSize(relationQueryDTO.getPageSize());
         hmPageRelationQo.setPageCode(relationQueryDTO.getPageId() + "");
-        Page<HmPageRelationBO> hmPageRelationPage = pageRelationService.queryPageTemplateRelationWithSearchText(hmPageRelationQo);
+        hmPageRelationQo.setStatus(HmPageStatus.ENABLE.getCode());
+        Page<HmPageRelationBO> hmPageRelationPage = pageRelationService.queryPageRelationWithSearchText(hmPageRelationQo);
         return ServiceResponse.success(PageUtil.changeToCurrentPage(hmPageRelationPage, HmPageRelationDTO.class));
     }
 

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

@@ -6,6 +6,7 @@ import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
 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.service.hm.HmWelcomeRelationApiService;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
 import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
@@ -38,6 +39,7 @@ public class HmWelcomeRelationApiServiceImpl implements HmWelcomeRelationApiServ
         }
         WelcomeRelationQO welcomeRelationQo = new WelcomeRelationQO();
         welcomeRelationQo.setWelcomeId(queryWelcomeRelationQdto.getWelcomeId());
+        welcomeRelationQo.setStatus(WelcomeRelationStatusEnum.ENABLE.getCode());
         Page<HmWelcomeRelationBO> welcomeRelationPage = welcomeRelationService.queryWelcomeRelationPage(welcomeRelationQo);
         Page<HmWelcomeRelationDTO> welcomeRelationDTOPage = PageUtil.changeToCurrentPage(welcomeRelationPage, HmWelcomeRelationDTO.class);
         return ServiceResponse.success(welcomeRelationDTOPage);

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

@@ -163,6 +163,9 @@
             <if test="welcomeId != null">
                 and welcome_id = #{welcomeId}
             </if>
+            <if test="status != null">
+                and `status` = #{status}
+            </if>
         </where>
     </select>
 

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

@@ -275,5 +275,6 @@
                 and #{endTime} >= create_time
             </if>
         </where>
+        order by page_id desc
     </select>
 </mapper>
\ No newline at end of file

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

@@ -165,5 +165,6 @@
                 and `status` = #{status}
             </if>
         </where>
+        order by relation_id desc
     </select>
 </mapper>
\ No newline at end of file

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

@@ -13,6 +13,7 @@ import com.gic.haoban.manage.api.dto.hm.HmWelcomeRelationDTO;
 import com.gic.haoban.manage.api.dto.welcome.dto.FriendSettingDetailDTO;
 import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO;
 import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeListDTO;
+import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveCheckDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeRelationQDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.SaveFriendSettingQDTO;
@@ -21,6 +22,7 @@ import com.gic.haoban.manage.api.dto.welcome.qdto.SaveWelcomeQDTO;
 import com.gic.haoban.manage.api.enums.hm.HmWelcomeType;
 import com.gic.haoban.manage.api.service.hm.HmWelcomeRelationApiService;
 import com.gic.haoban.manage.api.service.out.WelcomeApiService;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.welcome.ListWelcomeQO;
 import com.gic.haoban.manage.web.qo.welcome.SaveFriendSettingQO;
 import com.gic.haoban.manage.web.qo.welcome.SaveWelcomeQO;
@@ -109,8 +111,37 @@ public class WelcomeController extends WebBaseController {
         if (StringUtils.isEmpty(welcomeId)) {
             RestResponse.failure(Constant.STRING_1, "欢迎语id为空", Boolean.FALSE);
         }
-        ServiceResponse<Boolean> response = welcomeApiService.removeWelcome(welcomeId);
-        return RestResponse.successResult(response.getResult());
+        ServiceResponse<WelcomeRemoveCheckDTO> serviceResponse = welcomeApiService.removeWelcomeWithErrorInfo(welcomeId);
+        if (serviceResponse.getResult() != null) {
+            // can't remove
+            return RestResponse.failure(HaoBanErrCode.ERR_9.getCode()+"", this.buildErrorMessage(serviceResponse.getResult()));
+        }
+        return RestResponse.successResult();
+    }
+
+    private String buildErrorMessage(WelcomeRemoveCheckDTO welcomeRemoveCheckDTO) {
+        StringBuilder stringBuilder = new StringBuilder("");
+        if (welcomeRemoveCheckDTO.getQrCodeReferNum() != null
+                && welcomeRemoveCheckDTO.getQrCodeReferNum() > 0
+                && welcomeRemoveCheckDTO.getLinkReferNum() != null
+                && welcomeRemoveCheckDTO.getLinkReferNum() > 0) {
+            stringBuilder.append("当前模板已关联状态为正常的活码（")
+                    .append(welcomeRemoveCheckDTO.getQrCodeReferNum())
+                    .append("）、链接（")
+                    .append(welcomeRemoveCheckDTO.getLinkReferNum())
+                    .append("），请确认相关活码是否不再使用该欢迎语以及链接已投放结束，取消关联后才可删除该模板");
+        } else if (welcomeRemoveCheckDTO.getQrCodeReferNum() != null
+                && welcomeRemoveCheckDTO.getQrCodeReferNum() > 0){
+            stringBuilder.append("当前模板已关联状态为正常的活码（")
+                    .append(welcomeRemoveCheckDTO.getQrCodeReferNum())
+                    .append("），请确认相关活码是否不再使用该欢迎语，取消关联后才可删除该模板");
+        }else if (welcomeRemoveCheckDTO.getLinkReferNum() != null
+                && welcomeRemoveCheckDTO.getLinkReferNum() > 0){
+            stringBuilder.append("当前模板已关联状态为正常的链接（")
+                    .append(welcomeRemoveCheckDTO.getLinkReferNum())
+                    .append("），请确认相关链接已投放结束，取消关联后才可删除该模板");
+        }
+        return stringBuilder.toString();
     }
 
     /**
@@ -220,18 +251,27 @@ public class WelcomeController extends WebBaseController {
 
     @RequestMapping(path = "/relation/list")
     public RestResponse<PageResult2<HmWelcomeRelationDTO>> queryWelcomeRelationList(@RequestParam("welcomeId") String welcomeId,
-                                                                                   @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                                                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+                                                                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         QueryWelcomeRelationQDTO queryWelcomeRelationQDTO = new QueryWelcomeRelationQDTO();
         queryWelcomeRelationQDTO.setWelcomeId(welcomeId);
         queryWelcomeRelationQDTO.setPageNum(pageNum);
         queryWelcomeRelationQDTO.setPageSize(pageSize);
         ServiceResponse<Page<HmWelcomeRelationDTO>> serviceResponse = welcomeRelationApiService.queryWelcomeRelation(queryWelcomeRelationQDTO);
-        if (serviceResponse.isSuccess()){
+        if (serviceResponse.isSuccess()) {
             Page<HmWelcomeRelationDTO> result = serviceResponse.getResult();
             return RestResponse.successResult(PageUtil.getPageInfo(result));
         }
         return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
     }
 
+
+    @RequestMapping(path = "/statistics")
+    public RestResponse<?> checkWelcomeReferStatistics(String welcomeId) {
+        if (StringUtils.isBlank(welcomeId)){
+            return RestResponse.failure(HaoBanErrCode.ERR_2.getCode()+"", HaoBanErrCode.ERR_2.getMsg());
+        }
+        return RestResponse.successResult(welcomeApiService.welcomeReferStatistics(welcomeId));
+    }
+
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmPageController.java

@@ -11,13 +11,18 @@ import com.gic.haoban.manage.api.dto.qdto.hm.HmPageRelationQDTO;
 import com.gic.haoban.manage.api.dto.hm.HmPageRelationDTO;
 import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
 import com.gic.haoban.manage.api.service.hm.HmPageApiService;
+import com.gic.haoban.manage.web.vo.hm.HmPageInfoVO;
 import com.gic.haoban.manage.web.vo.hm.HmPageListVO;
-import com.gic.haoban.manage.web.vo.hm.HmPageSettingVO;
+import com.gic.haoban.manage.web.vo.hm.HmPageSettingReq;
 import com.gic.haoban.manage.web.vo.hm.PageRelationVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * @Author MUSI
  * @Date 2022/7/4 1:58 PM
@@ -32,21 +37,21 @@ public class HmPageController {
     private HmPageApiService pageApiService;
 
     @RequestMapping(path = "/page/save")
-    public RestResponse<?> savePage(HmPageSettingVO pageSettingVO){
+    public RestResponse<?> savePage(HmPageSettingReq pageSettingVO){
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        HmPageDTO pageTemplateDTO = new HmPageDTO();
-        pageTemplateDTO.setPageName(pageSettingVO.getTemplateName());
-        pageTemplateDTO.setPageTitle(pageSettingVO.getPageTitle());
-        pageTemplateDTO.setMerchantName(pageSettingVO.getMerchantName());
-        pageTemplateDTO.setMerchantPhoneNumber(pageSettingVO.getMerchantPhoneNumber());
-        pageTemplateDTO.setMerchantLogo(pageSettingVO.getMerchantLogo());
-        pageTemplateDTO.setPageBackgroundImg(pageSettingVO.getPageBackgroundImg());
-        pageTemplateDTO.setGuideComment(pageSettingVO.getGuideComment());
-        pageTemplateDTO.setClerkId(loginUser.getClerkId());
-        pageTemplateDTO.setClerkName(loginUser.getClerkName());
-        pageTemplateDTO.setEnterpriseId(loginUser.getEnterpriseId());
-        pageTemplateDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
-        ServiceResponse<Long> serviceResponse = pageApiService.saveOrUpdateHmPage(pageTemplateDTO);
+        HmPageDTO pageDTO = new HmPageDTO();
+        pageDTO.setPageName(pageSettingVO.getTemplateName());
+        pageDTO.setPageTitle(pageSettingVO.getPageTitle());
+        pageDTO.setMerchantName(pageSettingVO.getMerchantName());
+        pageDTO.setMerchantPhoneNumber(pageSettingVO.getMerchantPhoneNumber());
+        pageDTO.setMerchantLogo(pageSettingVO.getMerchantLogo());
+        pageDTO.setPageBackgroundImg(pageSettingVO.getPageBackgroundImg());
+        pageDTO.setGuideComment(pageSettingVO.getGuideComment());
+        pageDTO.setCreateorId(loginUser.getClerkId());
+        pageDTO.setCreateorName(loginUser.getClerkName());
+        pageDTO.setEnterpriseId(loginUser.getEnterpriseId());
+        pageDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
+        ServiceResponse<Long> serviceResponse = pageApiService.saveOrUpdateHmPage(pageDTO);
         if (serviceResponse.isSuccess()){
             return RestResponse.successResult(serviceResponse.getResult());
         }
@@ -55,22 +60,22 @@ public class HmPageController {
 
 
     @RequestMapping(path = "/page/edit")
-    public RestResponse<?> editPageTemplate(HmPageSettingVO pageSettingVO){
+    public RestResponse<?> editPageTemplate(HmPageSettingReq pageSettingVO){
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        HmPageDTO pageTemplateDTO = new HmPageDTO();
-        pageTemplateDTO.setPageId(pageSettingVO.getTemplateId());
-        pageTemplateDTO.setPageName(pageSettingVO.getTemplateName());
-        pageTemplateDTO.setPageTitle(pageSettingVO.getPageTitle());
-        pageTemplateDTO.setMerchantName(pageSettingVO.getMerchantName());
-        pageTemplateDTO.setMerchantPhoneNumber(pageSettingVO.getMerchantPhoneNumber());
-        pageTemplateDTO.setMerchantLogo(pageSettingVO.getMerchantLogo());
-        pageTemplateDTO.setPageBackgroundImg(pageSettingVO.getPageBackgroundImg());
-        pageTemplateDTO.setGuideComment(pageSettingVO.getGuideComment());
-        pageTemplateDTO.setClerkId(loginUser.getClerkId());
-        pageTemplateDTO.setClerkName(loginUser.getClerkName());
-        pageTemplateDTO.setEnterpriseId(loginUser.getEnterpriseId());
-        pageTemplateDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
-        ServiceResponse<Long> serviceResponse = pageApiService.saveOrUpdateHmPage(pageTemplateDTO);
+        HmPageDTO pageDTO = new HmPageDTO();
+        pageDTO.setPageId(pageSettingVO.getTemplateId());
+        pageDTO.setPageName(pageSettingVO.getTemplateName());
+        pageDTO.setPageTitle(pageSettingVO.getPageTitle());
+        pageDTO.setMerchantName(pageSettingVO.getMerchantName());
+        pageDTO.setMerchantPhoneNumber(pageSettingVO.getMerchantPhoneNumber());
+        pageDTO.setMerchantLogo(pageSettingVO.getMerchantLogo());
+        pageDTO.setPageBackgroundImg(pageSettingVO.getPageBackgroundImg());
+        pageDTO.setGuideComment(pageSettingVO.getGuideComment());
+        pageDTO.setCreateorId(loginUser.getClerkId());
+        pageDTO.setCreateorName(loginUser.getClerkName());
+        pageDTO.setEnterpriseId(loginUser.getEnterpriseId());
+        pageDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
+        ServiceResponse<Long> serviceResponse = pageApiService.saveOrUpdateHmPage(pageDTO);
         if (serviceResponse.isSuccess()){
             return RestResponse.successResult(serviceResponse.getResult());
         }
@@ -91,6 +96,15 @@ public class HmPageController {
         hmPageQDTO.setEndTime(pageListVO.getEndTime());
         ServiceResponse<Page<HmPageDTO>> serviceResponse = pageApiService.queryPageList(hmPageQDTO);
         PageResult2 pageInfo = PageUtil.getPageInfo(serviceResponse.getResult());
+        List<HmPageInfoVO> pageInfoVos = ((List<HmPageDTO>)pageInfo.getList()).stream().map(item -> {
+            HmPageInfoVO pageInfoVo = new HmPageInfoVO();
+            BeanUtils.copyProperties(item, pageInfoVo);
+            pageInfoVo.setTemplateName(item.getPageName());
+            pageInfoVo.setTemplateCode(item.getPageCode());
+            pageInfoVo.setTemplateId(item.getPageId());
+            return pageInfoVo;
+        }).collect(Collectors.toList());
+        pageInfo.setList(pageInfoVos);
         return RestResponse.successResult(pageInfo);
     }
 
@@ -99,8 +113,8 @@ public class HmPageController {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         HmPageDTO hmPageDTO = new HmPageDTO();
         hmPageDTO.setPageId(pageId);
-        hmPageDTO.setClerkId(loginUser.getClerkId());
-        hmPageDTO.setClerkName(loginUser.getClerkName());
+        hmPageDTO.setModifierId(loginUser.getClerkId());
+        hmPageDTO.setModifierName(loginUser.getClerkName());
         ServiceResponse<Boolean> serviceResponse = pageApiService.deleteHmPage(hmPageDTO);
         if (serviceResponse.isSuccess()){
             return RestResponse.successResult(serviceResponse.getResult());
@@ -109,8 +123,8 @@ public class HmPageController {
     }
 
     @RequestMapping(path = "/page/detail")
-    public RestResponse<?> queryPageDetail(Long pageId){
-        ServiceResponse<HmPageDTO> serviceResponse = pageApiService.queryPageDetail(pageId);
+    public RestResponse<?> queryPageDetail(Long templateId){
+        ServiceResponse<HmPageDTO> serviceResponse = pageApiService.queryPageDetail(templateId);
         return RestResponse.successResult(serviceResponse.getResult());
     }
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/HmPageInfoVO.java

+package com.gic.haoban.manage.web.vo.hm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/9 3:31 PM
+ * @Description
+ * @Version
+ **/
+public class HmPageInfoVO implements Serializable {
+
+    /**
+     * 落地页id
+     */
+    private Long templateId;
+
+    /**
+     * 落地页code
+     */
+    private String templateCode;
+
+    /**
+     * 落地页模板名称
+     */
+    private String templateName;
+
+    private Integer status;
+
+    /**
+     * 页面标题
+     */
+    private String pageTitle;
+
+    /**
+     * 商户名称
+     */
+    private String merchantName;
+
+    /**
+     * 商户名称
+     */
+    private String merchantPhoneNumber;
+
+    /**
+     * 商户logo
+     */
+    private String merchantLogo;
+
+    /**
+     * 页面背景图
+     */
+    private String pageBackgroundImg;
+
+    /**
+     * 引导语
+     */
+    private String guideComment;
+
+    /**
+     * 创建人id
+     */
+    private String createorId;
+
+    /**
+     * 创建人名称
+     */
+    private String createorName;
+
+    private String modifierId;
+
+    private String modifierName;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    private Date updateTime;
+
+    public Long getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(Long templateId) {
+        this.templateId = templateId;
+    }
+
+    public String getTemplateCode() {
+        return templateCode;
+    }
+
+    public void setTemplateCode(String templateCode) {
+        this.templateCode = templateCode;
+    }
+
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getPageTitle() {
+        return pageTitle;
+    }
+
+    public void setPageTitle(String pageTitle) {
+        this.pageTitle = pageTitle;
+    }
+
+    public String getMerchantName() {
+        return merchantName;
+    }
+
+    public void setMerchantName(String merchantName) {
+        this.merchantName = merchantName;
+    }
+
+    public String getMerchantPhoneNumber() {
+        return merchantPhoneNumber;
+    }
+
+    public void setMerchantPhoneNumber(String merchantPhoneNumber) {
+        this.merchantPhoneNumber = merchantPhoneNumber;
+    }
+
+    public String getMerchantLogo() {
+        return merchantLogo;
+    }
+
+    public void setMerchantLogo(String merchantLogo) {
+        this.merchantLogo = merchantLogo;
+    }
+
+    public String getPageBackgroundImg() {
+        return pageBackgroundImg;
+    }
+
+    public void setPageBackgroundImg(String pageBackgroundImg) {
+        this.pageBackgroundImg = pageBackgroundImg;
+    }
+
+    public String getGuideComment() {
+        return guideComment;
+    }
+
+    public void setGuideComment(String guideComment) {
+        this.guideComment = guideComment;
+    }
+
+    public String getCreateorId() {
+        return createorId;
+    }
+
+    public void setCreateorId(String createorId) {
+        this.createorId = createorId;
+    }
+
+    public String getCreateorName() {
+        return createorName;
+    }
+
+    public void setCreateorName(String createorName) {
+        this.createorName = createorName;
+    }
+
+    public String getModifierId() {
+        return modifierId;
+    }
+
+    public void setModifierId(String modifierId) {
+        this.modifierId = modifierId;
+    }
+
+    public String getModifierName() {
+        return modifierName;
+    }
+
+    public void setModifierName(String modifierName) {
+        this.modifierName = modifierName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/HmPageSettingVO.java → haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/HmPageSettingReq.java

@@ -8,8 +8,9 @@ import java.io.Serializable;
  * @Description
  * @Version
  **/
-public class HmPageSettingVO implements Serializable {
+public class HmPageSettingReq implements Serializable {
 
+    private static final long serialVersionUID = -3759274516687664059L;
     private Long templateId;
     /**
      * 落地页模板名称