feat: 命名规范

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

 package com.gic.haoban.manage.api.dto.hm;
 
+import com.gic.haoban.manage.api.enums.hm.HmPageType;
+
 import java.io.Serializable;
 
 /**
@@ -40,7 +42,7 @@ public class HmPageRelationDTO implements Serializable {
     /**
      * 引用方来源
      *
-     * @see com.gic.haoban.manage.api.enums.hm.HmPageTemplateType
+     * @see HmPageType
      */
     private Integer type;
 

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/hm/HmPageTemplateStatus.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/hm/HmPageStatus.java

@@ -6,7 +6,7 @@ package com.gic.haoban.manage.api.enums.hm;
  * @Description
  * @Version
  **/
-public enum HmPageTemplateStatus {
+public enum HmPageStatus {
 
 
     /**
@@ -18,7 +18,7 @@ public enum HmPageTemplateStatus {
      * 删除
      */
     DISABLE(0, "禁用");
-    HmPageTemplateStatus(Integer code, String desc){
+    HmPageStatus(Integer code, String desc){
         this.code = code;
         this.desc = desc;
     }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/hm/HmPageTemplateType.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/hm/HmPageType.java

@@ -6,11 +6,11 @@ package com.gic.haoban.manage.api.enums.hm;
  * @Description
  * @Version
  **/
-public enum HmPageTemplateType {
+public enum HmPageType {
 
 
     LINK(1, "引流链接");
-    HmPageTemplateType(Integer code, String desc){
+    HmPageType(Integer code, String desc){
         this.code = code;
         this.desc = desc;
     }

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

@@ -44,5 +44,5 @@ public interface HmGroupApiService {
      * @param wxEnterpriseId
      * @return
      */
-    ServiceResponse<Integer> queryGroupReferCount(String enterpriseId, String wxEnterpriseId);
+    ServiceResponse<Integer> queryGroupTotalReferCount(String enterpriseId, String wxEnterpriseId);
 }
\ No newline at end of file

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

+package com.gic.haoban.manage.service.pojo.bo.hm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/9 6:39 AM
+ * @Description
+ * @Version
+ **/
+public class HmGroupSettingBO implements Serializable {
+
+    private static final long serialVersionUID = 8357992629261773954L;
+
+    private Long groupId;
+
+    private String groupName;
+
+    private String enterpriseId;
+
+    private String wxEnterpriseId;
+
+    private Integer referNum;
+
+    private Integer status;
+
+    private Integer sort;
+
+    private String creatorId;
+
+    private String creatorName;
+
+    private String modifierId;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String modifierName;
+
+    /**
+     * 是否为默认分组
+     */
+    private Integer defaultFlag;
+
+    public Long getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Long groupId) {
+        this.groupId = groupId;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public Integer getReferNum() {
+        return referNum;
+    }
+
+    public void setReferNum(Integer referNum) {
+        this.referNum = referNum;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public String getCreatorId() {
+        return creatorId;
+    }
+
+    public void setCreatorId(String creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    public String getCreatorName() {
+        return creatorName;
+    }
+
+    public void setCreatorName(String creatorName) {
+        this.creatorName = creatorName;
+    }
+
+    public String getModifierId() {
+        return modifierId;
+    }
+
+    public void setModifierId(String modifierId) {
+        this.modifierId = modifierId;
+    }
+
+    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;
+    }
+
+    public String getModifierName() {
+        return modifierName;
+    }
+
+    public void setModifierName(String modifierName) {
+        this.modifierName = modifierName;
+    }
+
+    public Integer getDefaultFlag() {
+        return defaultFlag;
+    }
+
+    public void setDefaultFlag(Integer defaultFlag) {
+        this.defaultFlag = defaultFlag;
+    }
+}

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

 package com.gic.haoban.manage.service.pojo.bo.hm;
 
+import com.gic.haoban.manage.api.enums.hm.HmPageStatus;
+import com.gic.haoban.manage.api.enums.hm.HmPageType;
+
 import java.io.Serializable;
 
 /**
@@ -40,13 +43,13 @@ public class HmPageRelationBO implements Serializable {
     /**
      * 引用方来源
      *
-     * @see com.gic.haoban.manage.api.enums.hm.HmPageTemplateType
+     * @see HmPageType
      */
     private Integer type;
 
     /**
      * 关联状态
-     * @see com.gic.haoban.manage.api.enums.hm.HmPageTemplateStatus
+     * @see HmPageStatus
      *
      */
     private Integer status;

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

 package com.gic.haoban.manage.service.pojo.qo;
 
 import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.manage.api.enums.hm.HmPageStatus;
 
 import java.util.Date;
 
@@ -37,7 +38,7 @@ public class HmPageTemplateQO extends BasePageInfo {
     private Date endTime;
 
     /**
-     * @see com.gic.haoban.manage.api.enums.hm.HmPageTemplateStatus
+     * @see HmPageStatus
      */
     private Integer status;
 

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

 package com.gic.haoban.manage.service.service.hm;
 
+import com.gic.api.base.commons.Page;
+import com.gic.haoban.manage.api.dto.hm.HmGroupDTO;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmGroupRelationBO;
+import com.gic.haoban.manage.service.pojo.bo.hm.HmGroupSettingBO;
+import com.gic.haoban.manage.service.pojo.qo.HmGroupInfoQO;
 
 import java.util.List;
 
@@ -28,4 +32,40 @@ public interface HmGroupService {
      */
     Boolean batchUpdateGroupRelationCount(List<HmGroupRelationBO> groupRelations);
 
+    /**
+     * 查询分组被引用的次数
+     * @param enterpriseId
+     * @param wxEnterpriseId
+     * @return
+     */
+    Integer queryGroupTotalReferCount(String enterpriseId, String wxEnterpriseId);
+
+    /**
+     * 删除分组
+     * @param groupDTO
+     */
+    void deleteGroupSetting(HmGroupDTO groupDTO);
+
+
+    /**
+     * 查询分组详情
+     * @param groupId
+     * @return
+     */
+    HmGroupSettingBO queryGroupSettingDetail(Long groupId);
+
+    /**
+     * 条件查询分组列表
+     * @param groupInfoQo
+     * @return
+     */
+    Page<HmGroupSettingBO> queryGroupSettingList(HmGroupInfoQO groupInfoQo);
+
+    /**
+     * 保存分组
+     * @param groupDTO
+     * @return
+     */
+    Long saveOrUpdateGroupSetting(HmGroupDTO groupDTO);
+
 }

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

@@ -38,14 +38,14 @@ public interface HmPageService {
 
     /**
      * 删除落地页模板
-     * @param pageTemplateDTO
+     * @param pageDTO
      */
-    void deleteHmPageTemplate(HmPageDTO pageTemplateDTO);
+    void deleteHmPage(HmPageDTO pageDTO);
 
     /**
      * 保存
-     * @param pageTemplateDTO
+     * @param pageDTO
      * @return
      */
-    Long saveOrUpdateHmPageTemplate(HmPageDTO pageTemplateDTO);
+    Long saveOrUpdateHmPage(HmPageDTO pageDTO);
 }

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

 package com.gic.haoban.manage.service.service.hm;
 
+import com.gic.api.base.commons.Page;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
 import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
 
@@ -27,4 +28,11 @@ public interface WelcomeRelationService {
      * @return
      */
     List<HmWelcomeRelationBO> queryWelcomeRelationList(WelcomeRelationQO welcomeRelationQo);
+
+    /**
+     * 分页查询 欢迎语关联列表
+     * @param welcomeRelationQo
+     * @return
+     */
+    Page<HmWelcomeRelationBO> queryWelcomeRelationPage(WelcomeRelationQO welcomeRelationQo);
 }

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

 package com.gic.haoban.manage.service.service.hm.impl;
 
+import com.gic.api.base.commons.Page;
+import com.gic.commons.util.UniqueIdUtils;
+import com.gic.haoban.common.utils.PageUtil;
+import com.gic.haoban.manage.api.dto.hm.HmGroupDTO;
 import com.gic.haoban.manage.api.enums.hm.HmGroupStatus;
 import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmGroupSettingMapper;
 import com.gic.haoban.manage.service.entity.hm.TabHaobanHmGroupSetting;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmGroupRelationBO;
+import com.gic.haoban.manage.service.pojo.bo.hm.HmGroupSettingBO;
+import com.gic.haoban.manage.service.pojo.qo.HmGroupInfoQO;
 import com.gic.haoban.manage.service.service.hm.HmGroupService;
+import com.github.pagehelper.PageHelper;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -24,6 +36,9 @@ public class HmGroupServiceImpl implements HmGroupService {
 
     private static final Logger log = LoggerFactory.getLogger(HmGroupServiceImpl.class);
 
+    private static final Long DEFAULT_GROUP_ID = NumberUtils.LONG_ZERO;
+    private static final String DEFAULT_GROUP_NAME = "默认分组";
+
     @Autowired
     private TabHaobanHmGroupSettingMapper haobanHmGroupSettingMapper;
 
@@ -45,4 +60,95 @@ public class HmGroupServiceImpl implements HmGroupService {
         });
         return null;
     }
+
+    /**
+     * 查询分组被引用的次数
+     *
+     * @param enterpriseId
+     * @param wxEnterpriseId
+     * @return
+     */
+    @Override
+    public Integer queryGroupTotalReferCount(String enterpriseId, String wxEnterpriseId) {
+        return 0;
+    }
+
+    /**
+     * 删除分组
+     *
+     * @param groupDTO
+     */
+    @Override
+    public void deleteGroupSetting(HmGroupDTO groupDTO) {
+        TabHaobanHmGroupSetting tempGroupSetting = new TabHaobanHmGroupSetting();
+        tempGroupSetting.setGroupId(groupDTO.getGroupId());
+        tempGroupSetting.setStatus(HmGroupStatus.DISABLE.getCode());
+        tempGroupSetting.setModifierId(groupDTO.getModifierId());
+        tempGroupSetting.setModifierName(groupDTO.getModifierName());
+        tempGroupSetting.setUpdateTime(new Date());
+        haobanHmGroupSettingMapper.updateByPrimaryKeySelective(tempGroupSetting);
+    }
+
+    /**
+     * 查询分组详情
+     *
+     * @param groupId
+     * @return
+     */
+    @Override
+    public HmGroupSettingBO queryGroupSettingDetail(Long groupId) {
+        TabHaobanHmGroupSetting tabHaobanHmGroupSetting = haobanHmGroupSettingMapper.selectByPrimaryKey(groupId);
+        if (tabHaobanHmGroupSetting == null){
+            return null;
+        }
+        HmGroupSettingBO groupSettingBo = new HmGroupSettingBO();
+        BeanUtils.copyProperties(tabHaobanHmGroupSetting, groupSettingBo);
+        return groupSettingBo;
+    }
+
+    /**
+     * 条件查询分组列表
+     *
+     * @param groupInfoQo
+     * @return
+     */
+    @Override
+    public Page<HmGroupSettingBO> queryGroupSettingList(HmGroupInfoQO groupInfoQo) {
+        PageHelper.startPage(groupInfoQo.getPageNum(), groupInfoQo.getPageSize());
+        com.github.pagehelper.Page<TabHaobanHmGroupSetting> tabHaobanHmGroupSettings =
+                (com.github.pagehelper.Page<TabHaobanHmGroupSetting>) haobanHmGroupSettingMapper.queryHmGroupSettingList(groupInfoQo);
+        return PageUtil.changePageHelperToCurrentPage(tabHaobanHmGroupSettings, HmGroupSettingBO.class);
+    }
+
+    /**
+     * 保存分组
+     *
+     * @param groupDTO
+     * @return
+     */
+    @Override
+    public Long saveOrUpdateGroupSetting(HmGroupDTO groupDTO) {
+        if (groupDTO.getGroupId() == null) {
+            TabHaobanHmGroupSetting tempGroupSetting = new TabHaobanHmGroupSetting();
+            tempGroupSetting.setGroupId(UniqueIdUtils.uniqueLong());
+            tempGroupSetting.setGroupName(groupDTO.getGroupName());
+            tempGroupSetting.setCreatorId(groupDTO.getCreatorId());
+            tempGroupSetting.setCreatorName(groupDTO.getCreatorName());
+            tempGroupSetting.setCreateTime(new Date());
+            tempGroupSetting.setStatus(HmGroupStatus.ENABLE.getCode());
+            tempGroupSetting.setEnterpriseId(groupDTO.getEnterpriseId());
+            tempGroupSetting.setWxEnterpriseId(groupDTO.getWxEnterpriseId());
+            haobanHmGroupSettingMapper.insertSelective(tempGroupSetting);
+            return tempGroupSetting.getGroupId();
+        }else {
+            TabHaobanHmGroupSetting tempGroupSetting = new TabHaobanHmGroupSetting();
+            tempGroupSetting.setGroupId(groupDTO.getGroupId());
+            tempGroupSetting.setGroupName(groupDTO.getGroupName());
+            tempGroupSetting.setModifierId(groupDTO.getModifierId());
+            tempGroupSetting.setModifierName(groupDTO.getModifierName());
+            tempGroupSetting.setUpdateTime(new Date());
+            haobanHmGroupSettingMapper.updateByPrimaryKeySelective(tempGroupSetting);
+            return tempGroupSetting.getGroupId();
+        }
+    }
 }

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

@@ -2,8 +2,8 @@ package com.gic.haoban.manage.service.service.hm.impl;
 
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.manage.api.enums.hm.HmPageTemplateStatus;
-import com.gic.haoban.manage.api.enums.hm.HmPageTemplateType;
+import com.gic.haoban.manage.api.enums.hm.HmPageStatus;
+import com.gic.haoban.manage.api.enums.hm.HmPageType;
 import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmPageRelationMapper;
 import com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmPageRelationBO;
@@ -47,8 +47,8 @@ public class HmPageRelationServiceImpl implements HmPageRelationService {
         pageRelation.setReferName(hmPageRelationBO.getReferName());
         pageRelation.setCreateTime(new Date());
         pageRelation.setUpdateTime(new Date());
-        pageRelation.setType(HmPageTemplateType.LINK.getCode());
-        pageRelation.setStatus(HmPageTemplateStatus.ENABLE.getCode());
+        pageRelation.setType(HmPageType.LINK.getCode());
+        pageRelation.setStatus(HmPageStatus.ENABLE.getCode());
         return haobanHmPageRelationMapper.insertSelective(pageRelation) == 1;
     }
 
@@ -61,7 +61,7 @@ public class HmPageRelationServiceImpl implements HmPageRelationService {
     public List<HmPageRelationBO> queryPageTemplateRelation(String pageCode) {
         HmPageRelationQO hmPageRelationQo = new HmPageRelationQO();
         hmPageRelationQo.setPageCode(pageCode);
-        hmPageRelationQo.setStatus(HmPageTemplateStatus.ENABLE.getCode());
+        hmPageRelationQo.setStatus(HmPageStatus.ENABLE.getCode());
         hmPageRelationQo.setPageSize(1);
         PageHelper.startPage(hmPageRelationQo.getPageNum(), hmPageRelationQo.getPageSize());
         List<TabHaobanHmPageRelation> tabHaobanHmPageRelations =

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

@@ -5,7 +5,7 @@ import com.gic.api.base.commons.Page;
 import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
-import com.gic.haoban.manage.api.enums.hm.HmPageTemplateStatus;
+import com.gic.haoban.manage.api.enums.hm.HmPageStatus;
 import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmPageMapper;
 import com.gic.haoban.manage.service.entity.hm.TabHaobanHmPage;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmPageBO;
@@ -80,16 +80,16 @@ public class HmPageServiceImpl implements HmPageService {
     /**
      * 删除落地页模板
      *
-     * @param pageTemplateDTO
+     * @param pageDTO
      */
     @Override
-    public void deleteHmPageTemplate(HmPageDTO pageTemplateDTO) {
+    public void deleteHmPage(HmPageDTO pageDTO) {
         TabHaobanHmPage tempHmPage = new TabHaobanHmPage();
-        tempHmPage.setPageId(pageTemplateDTO.getPageId());
-        tempHmPage.setStatus(HmPageTemplateStatus.DISABLE.getCode());
+        tempHmPage.setPageId(pageDTO.getPageId());
+        tempHmPage.setStatus(HmPageStatus.DISABLE.getCode());
         tempHmPage.setUpdateTime(new Date());
-        tempHmPage.setModifierId(pageTemplateDTO.getClerkId());
-        tempHmPage.setModifierName(pageTemplateDTO.getClerkName());
+        tempHmPage.setModifierId(pageDTO.getClerkId());
+        tempHmPage.setModifierName(pageDTO.getClerkName());
         log.info("[deleteHmPageTemplate] params:{}", JSON.toJSONString(tempHmPage));
         haobanHmPageMapper.updateByPrimaryKeySelective(tempHmPage);
     }
@@ -97,37 +97,37 @@ public class HmPageServiceImpl implements HmPageService {
     /**
      * 保存
      *
-     * @param pageTemplateDTO
+     * @param pageDTO
      * @return
      */
     @Override
-    public Long saveOrUpdateHmPageTemplate(HmPageDTO pageTemplateDTO) {
-        log.info("[saveOrUpdateHmPageTemplate] params:{}", JSON.toJSONString(pageTemplateDTO));
+    public Long saveOrUpdateHmPage(HmPageDTO pageDTO) {
+        log.info("[saveOrUpdateHmPageTemplate] params:{}", JSON.toJSONString(pageDTO));
         Date now = new Date();
-        if (Objects.isNull(pageTemplateDTO.getPageId())) {
+        if (Objects.isNull(pageDTO.getPageId())) {
             // save
             TabHaobanHmPage haobanHmPage = new TabHaobanHmPage();
-            BeanUtils.copyProperties(pageTemplateDTO, haobanHmPage);
+            BeanUtils.copyProperties(pageDTO, haobanHmPage);
             haobanHmPage.setPageId(UniqueIdUtils.uniqueLong());
             haobanHmPage.setPageCode(this.generatorTemplateCode(haobanHmPage.getPageId()));
-            haobanHmPage.setCreateorId(pageTemplateDTO.getClerkId());
-            haobanHmPage.setCreateorName(pageTemplateDTO.getClerkName());
+            haobanHmPage.setCreateorId(pageDTO.getClerkId());
+            haobanHmPage.setCreateorName(pageDTO.getClerkName());
             haobanHmPage.setCreateTime(now);
-            haobanHmPage.setModifierId(pageTemplateDTO.getClerkId());
-            haobanHmPage.setModifierName(pageTemplateDTO.getClerkName());
+            haobanHmPage.setModifierId(pageDTO.getClerkId());
+            haobanHmPage.setModifierName(pageDTO.getClerkName());
             haobanHmPage.setUpdateTime(now);
-            haobanHmPage.setStatus(HmPageTemplateStatus.ENABLE.getCode());
+            haobanHmPage.setStatus(HmPageStatus.ENABLE.getCode());
             haobanHmPageMapper.insertSelective(haobanHmPage);
             return haobanHmPage.getPageId();
         } else {
             // update
             TabHaobanHmPage haobanHmPage = new TabHaobanHmPage();
-            BeanUtils.copyProperties(pageTemplateDTO, haobanHmPage);
-            haobanHmPage.setPageId(pageTemplateDTO.getPageId());
+            BeanUtils.copyProperties(pageDTO, haobanHmPage);
+            haobanHmPage.setPageId(pageDTO.getPageId());
             haobanHmPage.setPageCode(null);
             haobanHmPage.setUpdateTime(now);
-            haobanHmPage.setModifierId(pageTemplateDTO.getClerkId());
-            haobanHmPage.setModifierName(pageTemplateDTO.getClerkName());
+            haobanHmPage.setModifierId(pageDTO.getClerkId());
+            haobanHmPage.setModifierName(pageDTO.getClerkName());
             haobanHmPageMapper.updateByPrimaryKeySelective(haobanHmPage);
             return haobanHmPage.getPageId();
         }

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

 package com.gic.haoban.manage.service.service.hm.impl;
 
+import com.gic.api.base.commons.Page;
+import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeTemplateRelationMapper;
 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.qo.WelcomeRelationQO;
 import com.gic.haoban.manage.service.service.hm.WelcomeRelationService;
+import com.github.pagehelper.PageHelper;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,4 +66,18 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService {
                     return welcomeRelationBo;
                 }).collect(Collectors.toList());
     }
+
+    /**
+     * 分页查询 欢迎语关联列表
+     *
+     * @param welcomeRelationQo
+     * @return
+     */
+    @Override
+    public Page<HmWelcomeRelationBO> queryWelcomeRelationPage(WelcomeRelationQO welcomeRelationQo) {
+        PageHelper.startPage(welcomeRelationQo.getPageNum(), welcomeRelationQo.getPageSize());
+        com.github.pagehelper.Page<TabHaobanWelcomeTemplateRelation> tabHaobanWelcomeTemplateRelations =
+                (com.github.pagehelper.Page<TabHaobanWelcomeTemplateRelation>) welcomeTemplateRelationMapper.queryWelcomeTemplate(welcomeRelationQo);
+        return PageUtil.changePageHelperToCurrentPage(tabHaobanWelcomeTemplateRelations, HmWelcomeRelationBO.class);
+    }
 }

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

@@ -8,7 +8,7 @@ import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
 import com.gic.haoban.manage.api.dto.hm.HmPageRelationDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmPageQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmPageRelationQDTO;
-import com.gic.haoban.manage.api.enums.hm.HmPageTemplateStatus;
+import com.gic.haoban.manage.api.enums.hm.HmPageStatus;
 import com.gic.haoban.manage.api.service.hm.HmPageApiService;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmPageBO;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmPageRelationBO;
@@ -37,8 +37,6 @@ import java.util.Objects;
 public class HmPageApiServiceImpl implements HmPageApiService {
 
     private static final Logger log = LoggerFactory.getLogger(HmPageApiServiceImpl.class);
-
-    private static final String TEMPLATE_CODE_PREFIX = "MB01";
     @Autowired
     private HmPageRelationService pageRelationService;
 
@@ -64,7 +62,7 @@ public class HmPageApiServiceImpl implements HmPageApiService {
                 return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_9.getCode() + "", HaoBanErrCodeCommon.ERR_9.getMsg());
             }
         }
-        return ServiceResponse.success(haobanHmPageService.saveOrUpdateHmPageTemplate(pageDTO));
+        return ServiceResponse.success(haobanHmPageService.saveOrUpdateHmPage(pageDTO));
     }
 
     @Override
@@ -72,13 +70,13 @@ public class HmPageApiServiceImpl implements HmPageApiService {
     public ServiceResponse<Boolean> deleteHmPage(HmPageDTO pageDTO) {
 
         HmPageBO pageBo = haobanHmPageService.queryHmPageDetail(pageDTO.getPageId());
-        if (Objects.isNull(pageBo) || !Objects.equals(HmPageTemplateStatus.ENABLE.getCode(), pageBo.getStatus())) {
+        if (Objects.isNull(pageBo) || !Objects.equals(HmPageStatus.ENABLE.getCode(), pageBo.getStatus())) {
             return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_8.getCode() + "", HaoBanErrCodeCommon.ERR_8.getMsg());
         }
         if (this.checkPageIsBeQuoted(pageBo.getPageCode()) > 0) {
             return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_9.getCode() + "", HaoBanErrCodeCommon.ERR_9.getMsg());
         }
-        haobanHmPageService.deleteHmPageTemplate(pageDTO);
+        haobanHmPageService.deleteHmPage(pageDTO);
         return ServiceResponse.success(Boolean.TRUE);
     }
 
@@ -86,7 +84,7 @@ public class HmPageApiServiceImpl implements HmPageApiService {
     public ServiceResponse<Page<HmPageDTO>> queryPageList(HmPageQDTO pageQueryDTO) {
         HmPageTemplateQO pageTemplateQo = new HmPageTemplateQO();
         BeanUtils.copyProperties(pageQueryDTO, pageTemplateQo);
-        pageTemplateQo.setStatus(HmPageTemplateStatus.ENABLE.getCode());
+        pageTemplateQo.setStatus(HmPageStatus.ENABLE.getCode());
         Page<HmPageBO> hmPageBoPages = haobanHmPageService.queryPageList(pageTemplateQo);
         Page<HmPageDTO> pageRespVos = PageUtil.changeToCurrentPage(hmPageBoPages, HmPageDTO.class);
         return ServiceResponse.success(pageRespVos);

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

@@ -7,10 +7,9 @@ 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.service.hm.HmWelcomeRelationApiService;
-import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeTemplateRelationMapper;
-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.qo.WelcomeRelationQO;
-import com.github.pagehelper.PageHelper;
+import com.gic.haoban.manage.service.service.hm.WelcomeRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -24,24 +23,23 @@ import org.springframework.stereotype.Component;
 public class HmWelcomeRelationApiServiceImpl implements HmWelcomeRelationApiService {
 
     @Autowired
-    private TabHaobanWelcomeTemplateRelationMapper welcomeTemplateRelationMapper;
+    private WelcomeRelationService welcomeRelationService;
+
     /**
      * 条件查询 欢迎语关联关系
      *
-     * @param queryWelcomeRelationQDTO
+     * @param queryWelcomeRelationQdto
      * @return
      */
     @Override
-    public ServiceResponse<Page<HmWelcomeRelationDTO>> queryWelcomeRelation(QueryWelcomeRelationQDTO queryWelcomeRelationQDTO) {
-        if (queryWelcomeRelationQDTO.getWelcomeId() == null){
+    public ServiceResponse<Page<HmWelcomeRelationDTO>> queryWelcomeRelation(QueryWelcomeRelationQDTO queryWelcomeRelationQdto) {
+        if (queryWelcomeRelationQdto.getWelcomeId() == null){
             return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_2.getCode()+"", HaoBanErrCodeCommon.ERR_2.getMsg());
         }
         WelcomeRelationQO welcomeRelationQo = new WelcomeRelationQO();
-        welcomeRelationQo.setWelcomeId(queryWelcomeRelationQDTO.getWelcomeId());
-        PageHelper.startPage(queryWelcomeRelationQDTO.getPageNum(), queryWelcomeRelationQDTO.getPageSize());
-        com.github.pagehelper.Page<TabHaobanWelcomeTemplateRelation> tabHaobanWelcomeTemplateRelations =
-                (com.github.pagehelper.Page<TabHaobanWelcomeTemplateRelation>) welcomeTemplateRelationMapper.queryWelcomeTemplate(welcomeRelationQo);
-        Page<HmWelcomeRelationDTO> hmWelcomeRelationDTOPage = PageUtil.changePageHelperToCurrentPage(tabHaobanWelcomeTemplateRelations, HmWelcomeRelationDTO.class);
-        return ServiceResponse.success(hmWelcomeRelationDTOPage);
+        welcomeRelationQo.setWelcomeId(queryWelcomeRelationQdto.getWelcomeId());
+        Page<HmWelcomeRelationBO> welcomeRelationPage = welcomeRelationService.queryWelcomeRelationPage(welcomeRelationQo);
+        Page<HmWelcomeRelationDTO> welcomeRelationDTOPage = PageUtil.changeToCurrentPage(welcomeRelationPage, HmWelcomeRelationDTO.class);
+        return ServiceResponse.success(welcomeRelationDTOPage);
     }
 }

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

@@ -103,7 +103,7 @@ public class HmGroupController extends WebBaseController {
     @RequestMapping(path = "/refer/count")
     public RestResponse<?> queryGroupTotalReferCount(){
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        ServiceResponse<Integer> serviceResponse = groupApiService.queryGroupReferCount(loginUser.getEnterpriseId(), loginUser.getWxEnterpriseId());
+        ServiceResponse<Integer> serviceResponse = groupApiService.queryGroupTotalReferCount(loginUser.getEnterpriseId(), loginUser.getWxEnterpriseId());
         return RestResponse.successResult(serviceResponse.getResult());
     }
 }

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

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
  **/
 @RestController
 @RequestMapping(path = "/hm/guide")
-public class HmPageTemplateController {
+public class HmPageController {
 
     @Autowired
     private HmPageApiService pageApiService;
@@ -50,7 +50,7 @@ public class HmPageTemplateController {
         if (serviceResponse.isSuccess()){
             return RestResponse.successResult(serviceResponse.getResult());
         }
-        return RestResponse.failure(serviceResponse.getCode()+"", serviceResponse.getMessage());
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
     }
 
 
@@ -74,7 +74,7 @@ public class HmPageTemplateController {
         if (serviceResponse.isSuccess()){
             return RestResponse.successResult(serviceResponse.getResult());
         }
-        return RestResponse.failure(serviceResponse.getCode()+"", serviceResponse.getMessage());
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
     }
 
     @RequestMapping(path = "/page/list")
@@ -105,7 +105,7 @@ public class HmPageTemplateController {
         if (serviceResponse.isSuccess()){
             return RestResponse.successResult(serviceResponse.getResult());
         }
-        return RestResponse.failure(serviceResponse.getCode()+"", serviceResponse.getMessage());
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
     }
 
     @RequestMapping(path = "/page/detail")