feat: 活码、落地页、欢迎语内部使用的接口定义

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/hm/HmGroupStatus.java

@@ -28,4 +28,11 @@ public enum HmGroupStatus {
     private String desc;
 
 
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
 }

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

+package com.gic.haoban.manage.api.enums.hm;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/1 5:41 PM
+ * @Description
+ * @Version
+ **/
+public enum HmPageTemplateStatus {
+
+
+    /**
+     * 启用
+     */
+    ENABLE(1, "启用"),
+
+    /**
+     * 删除
+     */
+    DISABLE(0, "禁用");
+    HmPageTemplateStatus(Integer code, String desc){
+        this.code = code;
+        this.desc = desc;
+    }
+
+    private Integer code;
+    private String desc;
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

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

+package com.gic.haoban.manage.api.enums.hm;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/1 5:41 PM
+ * @Description
+ * @Version
+ **/
+public enum HmPageTemplateType {
+
+
+    LINK(1, "引流链接");
+    HmPageTemplateType(Integer code, String desc){
+        this.code = code;
+        this.desc = desc;
+    }
+
+    private Integer code;
+
+    /**
+     * 引用方
+     */
+    private String desc;
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanWelcomeTemplateRelationMapper.java

 package com.gic.haoban.manage.service.dao.mapper;
 
-import com.gic.haoban.manage.service.entity.TabHaobanWelcomeTemplateRelation;
+import com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation;
 
 public interface TabHaobanWelcomeTemplateRelationMapper {
+    int deleteByPrimaryKey(Long relationId);
+
     int insert(TabHaobanWelcomeTemplateRelation record);
 
     int insertSelective(TabHaobanWelcomeTemplateRelation record);
+
+    TabHaobanWelcomeTemplateRelation selectByPrimaryKey(Long relationId);
+
+    int updateByPrimaryKeySelective(TabHaobanWelcomeTemplateRelation record);
+
+    int updateByPrimaryKey(TabHaobanWelcomeTemplateRelation record);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/TabHaobanHmGroupSettingMapper.java

 package com.gic.haoban.manage.service.dao.mapper.hm;
 
-import com.gic.haoban.manage.service.entity.TabHaobanHmGroupSetting;
+import com.gic.haoban.manage.service.entity.hm.TabHaobanHmGroupSetting;
+import com.gic.haoban.manage.service.pojo.qo.HmGroupInfoQO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface TabHaobanHmGroupSettingMapper {
+    int deleteByPrimaryKey(Long groupId);
+
     int insert(TabHaobanHmGroupSetting record);
 
     int insertSelective(TabHaobanHmGroupSetting record);
+
+    TabHaobanHmGroupSetting selectByPrimaryKey(Long groupId);
+
+    int updateByPrimaryKeySelective(TabHaobanHmGroupSetting record);
+
+    int updateByPrimaryKey(TabHaobanHmGroupSetting record);
+
+    /**
+     * 条件查询 活码分组
+     * @param hmGroupInfoQO
+     * @return
+     */
+    List<TabHaobanHmGroupSetting> queryHmGroupSettingList(HmGroupInfoQO hmGroupInfoQO);
+
+    /**
+     * 更新 分组被引用的数量
+     * @param groupId
+     * @param changeCount
+     * @return
+     */
+    int updateGroupSettingCount(@Param("groupId") Long groupId, @Param("changeCount") Integer changeCount);
+
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/TabHaobanHmPageMapper.java

 package com.gic.haoban.manage.service.dao.mapper.hm;
 
-import com.gic.haoban.manage.service.entity.TabHaobanHmPage;
+import com.gic.haoban.manage.service.entity.hm.TabHaobanHmPage;
 
 public interface TabHaobanHmPageMapper {
+    int deleteByPrimaryKey(Long templateId);
+
     int insert(TabHaobanHmPage record);
 
     int insertSelective(TabHaobanHmPage record);
+
+    TabHaobanHmPage selectByPrimaryKey(Long templateId);
+
+    int updateByPrimaryKeySelective(TabHaobanHmPage record);
+
+    int updateByPrimaryKey(TabHaobanHmPage record);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/TabHaobanHmPageRelationMapper.java

+package com.gic.haoban.manage.service.dao.mapper.hm;
+
+import com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation;
+
+public interface TabHaobanHmPageRelationMapper {
+    int deleteByPrimaryKey(Long relationId);
+
+    int insert(TabHaobanHmPageRelation record);
+
+    int insertSelective(TabHaobanHmPageRelation record);
+
+    TabHaobanHmPageRelation selectByPrimaryKey(Long relationId);
+
+    int updateByPrimaryKeySelective(TabHaobanHmPageRelation record);
+
+    int updateByPrimaryKey(TabHaobanHmPageRelation record);
+}
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanHmGroupSetting.java → haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/hm/TabHaobanHmGroupSetting.java

-package com.gic.haoban.manage.service.entity;
+package com.gic.haoban.manage.service.entity.hm;
 
 import java.util.Date;
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanHmPage.java → haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/hm/TabHaobanHmPage.java

-package com.gic.haoban.manage.service.entity;
+package com.gic.haoban.manage.service.entity.hm;
 
 import java.util.Date;
 
 public class TabHaobanHmPage {
+
+    /**
+     * 落地页id
+     */
     private Long templateId;
 
+    /**
+     * 落地页code
+     */
     private String templateCode;
 
+    /**
+     * 落地页模板名称
+     */
     private String templateName;
 
+    /**
+     * 企业id
+     */
     private String enterpriseId;
 
     private String wxEnterpriseId;
 
     private Integer status;
 
+    /**
+     * 页面标题
+     */
     private String pageTitle;
 
+    /**
+     * 商户名称
+     */
     private String merchantName;
 
-    private String merchantPhoneNumer;
+    /**
+     * 商户名称
+     */
+    private String merchantPhoneNumber;
 
+    /**
+     * 商户logo
+     */
     private String merchantLogo;
 
+    /**
+     * 页面背景图
+     */
     private String pageBackgroudImg;
 
+    /**
+     * 引导语
+     */
     private String guideComment;
 
+    /**
+     * 创建人id
+     */
     private String createorId;
 
+    /**
+     * 创建人名称
+     */
     private String createorName;
 
     private String modifierId;
 
     private String modifierName;
 
+    /**
+     * 创建时间
+     */
     private Date createTime;
 
     private Date updateTime;
@@ -103,12 +143,12 @@ public class TabHaobanHmPage {
         this.merchantName = merchantName == null ? null : merchantName.trim();
     }
 
-    public String getMerchantPhoneNumer() {
-        return merchantPhoneNumer;
+    public String getMerchantPhoneNumber() {
+        return merchantPhoneNumber;
     }
 
-    public void setMerchantPhoneNumer(String merchantPhoneNumer) {
-        this.merchantPhoneNumer = merchantPhoneNumer == null ? null : merchantPhoneNumer.trim();
+    public void setMerchantPhoneNumber(String merchantPhoneNumber) {
+        this.merchantPhoneNumber = merchantPhoneNumber == null ? null : merchantPhoneNumber.trim();
     }
 
     public String getMerchantLogo() {

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

+package com.gic.haoban.manage.service.entity.hm;
+
+import java.util.Date;
+
+public class TabHaobanHmPageRelation {
+    private Long relationId;
+
+    private String pageTemplateCode;
+
+    private String enterpriseId;
+
+    private String wxEnterpriseId;
+
+    private String referId;
+
+    private String referName;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Integer type;
+
+    private Integer status;
+
+    public Long getRelationId() {
+        return relationId;
+    }
+
+    public void setRelationId(Long relationId) {
+        this.relationId = relationId;
+    }
+
+    public String getPageTemplateCode() {
+        return pageTemplateCode;
+    }
+
+    public void setPageTemplateCode(String pageTemplateCode) {
+        this.pageTemplateCode = pageTemplateCode == null ? null : pageTemplateCode.trim();
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId == null ? null : enterpriseId.trim();
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
+    }
+
+    public String getReferId() {
+        return referId;
+    }
+
+    public void setReferId(String referId) {
+        this.referId = referId == null ? null : referId.trim();
+    }
+
+    public String getReferName() {
+        return referName;
+    }
+
+    public void setReferName(String referName) {
+        this.referName = referName == null ? null : referName.trim();
+    }
+
+    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 Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanWelcomeTemplateRelation.java → haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/hm/TabHaobanWelcomeTemplateRelation.java

-package com.gic.haoban.manage.service.entity;
+package com.gic.haoban.manage.service.entity.hm;
 
 import java.util.Date;
 

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 java.io.Serializable;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/1 5:38 PM
+ * @Description
+ * @Version
+ **/
+public class HmPageRelationBO implements Serializable {
+
+    /**
+     * 落地页模板code
+     */
+    private String pageTemplateCode;
+
+
+    /**
+     * 企业id
+     */
+    private String enterpriseId;
+
+    /**
+     * 微信企业id
+     */
+    private String wxEnterpriseId;
+
+    /**
+     * 引用方id
+     */
+    private String referId;
+
+    /**
+     * 引用方名称
+     */
+    private String referName;
+
+    /**
+     * 引用方来源
+     *
+     * @see com.gic.haoban.manage.api.enums.hm.HmPageTemplateType
+     */
+    private Integer type;
+
+    public String getPageTemplateCode() {
+        return pageTemplateCode;
+    }
+
+    public void setPageTemplateCode(String pageTemplateCode) {
+        this.pageTemplateCode = pageTemplateCode;
+    }
+
+    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 String getReferId() {
+        return referId;
+    }
+
+    public void setReferId(String referId) {
+        this.referId = referId;
+    }
+
+    public String getReferName() {
+        return referName;
+    }
+
+    public void setReferName(String referName) {
+        this.referName = referName;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+}

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

+package com.gic.haoban.manage.service.pojo.qo;
+
+import com.gic.haoban.base.api.common.BasePageInfo;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/1 4:47 PM
+ * @Description
+ * @Version
+ **/
+public class HmGroupInfoQO extends BasePageInfo {
+
+    private String groupName;
+
+    /**
+     * @see com.gic.haoban.manage.api.enums.hm.HmGroupStatus
+     */
+    private Integer status;
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    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/hm/HmGroupService.java

@@ -19,7 +19,7 @@ public interface HmGroupService {
      * @param changeCount
      * @return
      */
-    Boolean updateGroupRelationCount(String groupId, Integer changeCount);
+    Boolean updateGroupRelationCount(Long groupId, Integer changeCount);
 
 
     /**

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

+package com.gic.haoban.manage.service.service.hm;
+
+import com.gic.haoban.manage.service.pojo.bo.hm.HmPageRelationBO;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/1 5:37 PM
+ * @Description
+ * @Version
+ **/
+public interface HmPageRelationService {
+
+
+    /**
+     * 保存活码 与落地页的引用关系
+     * @param hmPageRelationBO
+     */
+    boolean savePageRelation(HmPageRelationBO hmPageRelationBO);
+
+    /**
+     * 更新 落地页关联状态
+     * @param hmPageRelationBO
+     * @return
+     */
+    boolean updateRelationStatus(HmPageRelationBO hmPageRelationBO);
+}

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

+package com.gic.haoban.manage.service.service.hm;
+
+import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeDetailBO;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/1 6:00 PM
+ * @Description 活码欢迎语相关
+ * @Version
+ **/
+public interface HmWelComeService {
+
+    /**
+     * 根据 关联方的code 获取关联的欢迎语
+     * @param referId
+     * @return
+     */
+    WelcomeDetailBO queryHmWelcomeWithReferId(String referId);
+}

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

+package com.gic.haoban.manage.service.service.hm;
+
+import com.gic.haoban.manage.service.entity.hm.TabHaobanHmPage;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/1 5:49 PM
+ * @Description
+ *  落地页相关
+ * @Version
+ **/
+public interface TabHaobanHmPageService {
+
+    /**
+     * 根据 referId 查询关联的落地页数据
+     * @param referId
+     * @return
+     */
+    TabHaobanHmPage queryHmPageTemplateWithReferId(String referId);
+}

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.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.service.hm.HmGroupService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/1 5:17 PM
+ * @Description
+ * @Version
+ **/
+@Component
+public class HmGroupServiceImpl implements HmGroupService {
+
+    private static final Logger log = LoggerFactory.getLogger(HmGroupServiceImpl.class);
+
+    @Autowired
+    private TabHaobanHmGroupSettingMapper haobanHmGroupSettingMapper;
+
+    @Override
+    public Boolean updateGroupRelationCount(Long groupId, Integer changeCount) {
+
+        TabHaobanHmGroupSetting tabHaobanHmGroupSetting = haobanHmGroupSettingMapper.selectByPrimaryKey(groupId);
+        if (tabHaobanHmGroupSetting == null || !HmGroupStatus.ENABLE.getCode().equals(tabHaobanHmGroupSetting.getStatus())){
+            return Boolean.FALSE;
+        }
+        return haobanHmGroupSettingMapper.updateGroupSettingCount(groupId, changeCount) == 1;
+    }
+
+    @Override
+    @Transactional(rollbackFor = RuntimeException.class)
+    public Boolean batchUpdateGroupRelationCount(List<HmGroupRelationBO> groupRelations) {
+        groupRelations.forEach(item -> {
+            haobanHmGroupSettingMapper.updateGroupSettingCount(item.getGroupId(), item.getChangeCount());
+        });
+        return null;
+    }
+}

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

+package com.gic.haoban.manage.service.service.out.impl.hm;
+
+import com.alibaba.fastjson.JSON;
+import com.gic.api.base.commons.Page;
+import com.gic.haoban.base.api.common.ServiceResponse;
+import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
+import com.gic.haoban.common.utils.PageUtil;
+import com.gic.haoban.manage.api.dto.hm.HmGroupDTO;
+import com.gic.haoban.manage.api.dto.hm.HmGroupQueryDTO;
+import com.gic.haoban.manage.api.enums.hm.HmGroupStatus;
+import com.gic.haoban.manage.api.service.hm.HmGroupApiService;
+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.qo.HmGroupInfoQO;
+import com.github.pagehelper.PageHelper;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+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 java.util.Date;
+import java.util.List;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/1 4:02 PM
+ * @Description
+ * @Version
+ **/
+@Component
+public class HmGroupApiServiceImpl implements HmGroupApiService {
+
+    private static final Logger log = LoggerFactory.getLogger(HmGroupApiServiceImpl.class);
+
+    @Autowired
+    private TabHaobanHmGroupSettingMapper haobanHmGroupSettingMapper;
+
+    @Override
+    public ServiceResponse<Long> saveOrUpdateHmGroupSetting(HmGroupDTO hmGroupDTO) {
+        ServiceResponse<Long> serviceResponse = new ServiceResponse();
+        if (StringUtils.isBlank(hmGroupDTO.getGroupName())) {
+            serviceResponse.setCode(HaoBanErrCodeCommon.ERR_2.getCode());
+            return serviceResponse;
+        }
+        HmGroupInfoQO groupInfoQO = new HmGroupInfoQO();
+        groupInfoQO.setGroupName(hmGroupDTO.getGroupName());
+        groupInfoQO.setStatus(HmGroupStatus.ENABLE.getCode());
+        List<TabHaobanHmGroupSetting> tabHaobanHmGroupSettings = haobanHmGroupSettingMapper.queryHmGroupSettingList(groupInfoQO);
+        if (hmGroupDTO.getGroupId() == null) {
+            // insert
+            // check groupName unique
+            if (CollectionUtils.isNotEmpty(tabHaobanHmGroupSettings)) {
+                serviceResponse.setCode(HaoBanErrCodeCommon.ERR_2.getCode());
+                return serviceResponse;
+            }
+            TabHaobanHmGroupSetting tempGroupSetting = new TabHaobanHmGroupSetting();
+            tempGroupSetting.setGroupName(hmGroupDTO.getGroupName());
+            tempGroupSetting.setCreatorId(hmGroupDTO.getCreatorId());
+            tempGroupSetting.setCreatorName(hmGroupDTO.getCreatorName());
+            tempGroupSetting.setCreateTime(new Date());
+            tempGroupSetting.setStatus(HmGroupStatus.ENABLE.getCode());
+            tempGroupSetting.setEnterpriseId(hmGroupDTO.getEnterpriseId());
+            tempGroupSetting.setWxEnterpriseId(hmGroupDTO.getWxEnterpriseId());
+            haobanHmGroupSettingMapper.insertSelective(tempGroupSetting);
+            serviceResponse.setResult(tempGroupSetting.getGroupId());
+        } else {
+            // update
+            if (CollectionUtils.isEmpty(tabHaobanHmGroupSettings) || tabHaobanHmGroupSettings.size() > 1) {
+                return null;
+            }
+            if (!tabHaobanHmGroupSettings.get(0).getGroupId().equals(hmGroupDTO.getGroupId())) {
+                return null;
+            }
+            TabHaobanHmGroupSetting tabHaobanHmGroupSetting = haobanHmGroupSettingMapper.selectByPrimaryKey(hmGroupDTO.getGroupId());
+            if (tabHaobanHmGroupSetting == null) {
+                serviceResponse.setCode(HaoBanErrCodeCommon.ERR_8.getCode());
+                return serviceResponse;
+            }
+            TabHaobanHmGroupSetting tempGroupSetting = new TabHaobanHmGroupSetting();
+            tempGroupSetting.setGroupId(tabHaobanHmGroupSetting.getGroupId());
+            tempGroupSetting.setGroupName(tabHaobanHmGroupSetting.getGroupName());
+            tempGroupSetting.setModifierId(hmGroupDTO.getModifierId());
+            tempGroupSetting.setModifierName(hmGroupDTO.getModifierName());
+            tempGroupSetting.setUpdateTime(new Date());
+            haobanHmGroupSettingMapper.updateByPrimaryKeySelective(tempGroupSetting);
+            serviceResponse.setResult(tempGroupSetting.getGroupId());
+        }
+        return serviceResponse;
+    }
+
+    @Override
+    public ServiceResponse<Page<HmGroupDTO>> queryHmGroupSettingList(HmGroupQueryDTO groupQueryDTO) {
+
+        HmGroupInfoQO groupInfoQO = new HmGroupInfoQO();
+        BeanUtils.copyProperties(groupInfoQO, groupInfoQO);
+        groupInfoQO.setStatus(HmGroupStatus.ENABLE.getCode());
+        PageHelper.startPage(groupInfoQO.getPageNum(), groupInfoQO.getPageSize());
+        com.github.pagehelper.Page<TabHaobanHmGroupSetting> tabHaobanHmGroupSettings = (com.github.pagehelper.Page<TabHaobanHmGroupSetting>) haobanHmGroupSettingMapper.queryHmGroupSettingList(groupInfoQO);
+        Page<HmGroupDTO> groupDTOPage = PageUtil.changePageHelperToCurrentPage(tabHaobanHmGroupSettings, HmGroupDTO.class);
+        ServiceResponse<Page<HmGroupDTO>> serviceResponse = new ServiceResponse<>();
+        serviceResponse.setResult(groupDTOPage);
+        return serviceResponse;
+    }
+
+    @Override
+    public ServiceResponse<Boolean> deleteGroupSetting(HmGroupDTO groupDTO) {
+        log.info("[deleteGroupSetting] 删除分组, params:{}", JSON.toJSONString(groupDTO));
+        ServiceResponse<Boolean> serviceResponse = new ServiceResponse<>();
+        serviceResponse.setResult(Boolean.FALSE);
+        if (groupDTO.getGroupId() == null) {
+            return serviceResponse;
+        }
+        TabHaobanHmGroupSetting tabHaobanHmGroupSetting = haobanHmGroupSettingMapper.selectByPrimaryKey(groupDTO.getGroupId());
+        if (tabHaobanHmGroupSetting == null || !HmGroupStatus.ENABLE.getCode().equals(tabHaobanHmGroupSetting.getStatus())) {
+            return serviceResponse;
+        }
+        // 校验分组是否被引用
+        TabHaobanHmGroupSetting tempGroupSetting = new TabHaobanHmGroupSetting();
+        tempGroupSetting.setGroupId(tabHaobanHmGroupSetting.getGroupId());
+        tempGroupSetting.setStatus(HmGroupStatus.DISABLE.getCode());
+        tempGroupSetting.setModifierId(groupDTO.getModifierId());
+        tempGroupSetting.setModifierName(groupDTO.getModifierName());
+        tempGroupSetting.setUpdateTime(new Date());
+        serviceResponse.setResult(haobanHmGroupSettingMapper.updateByPrimaryKeySelective(tempGroupSetting) == 1);
+        return serviceResponse;
+    }
+}

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

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeTemplateRelationMapper">
-    <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanWelcomeTemplateRelation">
-        <result column="relation_id" property="relationId" jdbcType="BIGINT"/>
+    <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation">
+        <id column="relation_id" property="relationId" jdbcType="BIGINT"/>
         <result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR"/>
         <result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR"/>
         <result column="welcome_id" property="welcomeId" jdbcType="VARCHAR"/>
@@ -13,7 +13,23 @@
         <result column="type" property="type" jdbcType="INTEGER"/>
         <result column="status" property="status" jdbcType="INTEGER"/>
     </resultMap>
-    <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWelcomeTemplateRelation">
+    <sql id="Base_Column_List">
+        relation_id
+        , enterprise_id, wx_enterprise_id, welcome_id, refer_id, refer_name, create_time,
+    update_time, type, status
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_welcome_template_relation
+        where relation_id = #{relationId,jdbcType=BIGINT}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete
+        from tab_haoban_welcome_template_relation
+        where relation_id = #{relationId,jdbcType=BIGINT}
+    </delete>
+    <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation">
         insert into tab_haoban_welcome_template_relation (relation_id, enterprise_id, wx_enterprise_id,
                                                           welcome_id, refer_id, refer_name,
                                                           create_time, update_time, type,
@@ -23,7 +39,8 @@
                 #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{type,jdbcType=INTEGER},
                 #{status,jdbcType=INTEGER})
     </insert>
-    <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWelcomeTemplateRelation">
+    <insert id="insertSelective"
+            parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation">
         insert into tab_haoban_welcome_template_relation
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="relationId != null">
@@ -90,4 +107,52 @@
             </if>
         </trim>
     </insert>
+    <update id="updateByPrimaryKeySelective"
+            parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation">
+        update tab_haoban_welcome_template_relation
+        <set>
+            <if test="enterpriseId != null">
+                enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
+            </if>
+            <if test="wxEnterpriseId != null">
+                wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
+            </if>
+            <if test="welcomeId != null">
+                welcome_id = #{welcomeId,jdbcType=VARCHAR},
+            </if>
+            <if test="referId != null">
+                refer_id = #{referId,jdbcType=VARCHAR},
+            </if>
+            <if test="referName != null">
+                refer_name = #{referName,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="type != null">
+                type = #{type,jdbcType=INTEGER},
+            </if>
+            <if test="status != null">
+                status = #{status,jdbcType=INTEGER},
+            </if>
+        </set>
+        where relation_id = #{relationId,jdbcType=BIGINT}
+    </update>
+    <update id="updateByPrimaryKey"
+            parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation">
+        update tab_haoban_welcome_template_relation
+        set enterprise_id    = #{enterpriseId,jdbcType=VARCHAR},
+            wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
+            welcome_id       = #{welcomeId,jdbcType=VARCHAR},
+            refer_id         = #{referId,jdbcType=VARCHAR},
+            refer_name       = #{referName,jdbcType=VARCHAR},
+            create_time      = #{createTime,jdbcType=TIMESTAMP},
+            update_time      = #{updateTime,jdbcType=TIMESTAMP},
+            type             = #{type,jdbcType=INTEGER},
+            status           = #{status,jdbcType=INTEGER}
+        where relation_id = #{relationId,jdbcType=BIGINT}
+    </update>
 </mapper>
\ No newline at end of file

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

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmGroupSettingMapper">
-    <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanHmGroupSetting">
-        <result column="group_id" property="groupId" jdbcType="BIGINT"/>
+    <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.hm.TabHaobanHmGroupSetting">
+        <id column="group_id" property="groupId" jdbcType="BIGINT"/>
         <result column="group_name" property="groupName" jdbcType="VARCHAR"/>
         <result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR"/>
         <result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR"/>
@@ -16,7 +16,24 @@
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
         <result column="modifier_name" property="modifierName" jdbcType="VARCHAR"/>
     </resultMap>
-    <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanHmGroupSetting">
+    <sql id="Base_Column_List">
+        group_id
+        , group_name, enterprise_id, wx_enterprise_id, refer_num, status, sort, creator_id,
+    creator_name, modifier_id, create_time, update_time, modifier_name
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_hm_group_setting
+        where group_id = #{groupId,jdbcType=BIGINT}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete
+        from tab_haoban_hm_group_setting
+        where group_id = #{groupId,jdbcType=BIGINT}
+    </delete>
+    <insert id="insert" useGeneratedKeys="true" keyProperty="groupId"
+            parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmGroupSetting">
         insert into tab_haoban_hm_group_setting (group_id, group_name, enterprise_id,
                                                  wx_enterprise_id, refer_num, status,
                                                  sort, creator_id, creator_name,
@@ -28,7 +45,8 @@
                 #{modifierId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
                 #{modifierName,jdbcType=VARCHAR})
     </insert>
-    <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanHmGroupSetting">
+    <insert id="insertSelective" useGeneratedKeys="true" keyProperty="groupId"
+            parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmGroupSetting">
         insert into tab_haoban_hm_group_setting
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="groupId != null">
@@ -113,4 +131,82 @@
             </if>
         </trim>
     </insert>
+    <update id="updateByPrimaryKeySelective"
+            parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmGroupSetting">
+        update tab_haoban_hm_group_setting
+        <set>
+            <if test="groupName != null">
+                group_name = #{groupName,jdbcType=VARCHAR},
+            </if>
+            <if test="enterpriseId != null">
+                enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
+            </if>
+            <if test="wxEnterpriseId != null">
+                wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
+            </if>
+            <if test="referNum != null">
+                refer_num = #{referNum,jdbcType=INTEGER},
+            </if>
+            <if test="status != null">
+                status = #{status,jdbcType=INTEGER},
+            </if>
+            <if test="sort != null">
+                sort = #{sort,jdbcType=INTEGER},
+            </if>
+            <if test="creatorId != null">
+                creator_id = #{creatorId,jdbcType=VARCHAR},
+            </if>
+            <if test="creatorName != null">
+                creator_name = #{creatorName,jdbcType=VARCHAR},
+            </if>
+            <if test="modifierId != null">
+                modifier_id = #{modifierId,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="modifierName != null">
+                modifier_name = #{modifierName,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where group_id = #{groupId,jdbcType=BIGINT}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmGroupSetting">
+        update tab_haoban_hm_group_setting
+        set group_name       = #{groupName,jdbcType=VARCHAR},
+            enterprise_id    = #{enterpriseId,jdbcType=VARCHAR},
+            wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
+            refer_num        = #{referNum,jdbcType=INTEGER},
+            status           = #{status,jdbcType=INTEGER},
+            sort             = #{sort,jdbcType=INTEGER},
+            creator_id       = #{creatorId,jdbcType=VARCHAR},
+            creator_name     = #{creatorName,jdbcType=VARCHAR},
+            modifier_id      = #{modifierId,jdbcType=VARCHAR},
+            create_time      = #{createTime,jdbcType=TIMESTAMP},
+            update_time      = #{updateTime,jdbcType=TIMESTAMP},
+            modifier_name    = #{modifierName,jdbcType=VARCHAR}
+        where group_id = #{groupId,jdbcType=BIGINT}
+    </update>
+
+    <select id="queryHmGroupSettingList" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List"/>
+        from tab_haoban_hm_group_setting
+        <where>
+            <if test="groupName != null and groupName != ''">
+                group_name = #{groupName}
+            </if>
+            <if test="status != null">
+                and `status` = #{status}
+            </if>
+        </where>
+    </select>
+
+    <update id="updateGroupSettingCount">
+        update tab_haoban_hm_group_setting
+        set refer_num = if(refer_num + #{changeCount} >= 0, refer_num + #{changeCount}, 0)
+        where group_id = #{groupId,jdbcType=BIGINT}
+    </update>
 </mapper>
\ No newline at end of file

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

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmPageMapper">
-    <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanHmPage">
-        <result column="template_id" property="templateId" jdbcType="BIGINT"/>
+    <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPage">
+        <id column="template_id" property="templateId" jdbcType="BIGINT"/>
         <result column="template_code" property="templateCode" jdbcType="CHAR"/>
         <result column="template_name" property="templateName" jdbcType="VARCHAR"/>
         <result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR"/>
@@ -10,7 +10,7 @@
         <result column="status" property="status" jdbcType="INTEGER"/>
         <result column="page_title" property="pageTitle" jdbcType="VARCHAR"/>
         <result column="merchant_name" property="merchantName" jdbcType="VARCHAR"/>
-        <result column="merchant_phone_numer" property="merchantPhoneNumer" jdbcType="VARCHAR"/>
+        <result column="merchant_phone_number" property="merchantPhoneNumber" jdbcType="VARCHAR"/>
         <result column="merchant_logo" property="merchantLogo" jdbcType="VARCHAR"/>
         <result column="page_backgroud_img" property="pageBackgroudImg" jdbcType="VARCHAR"/>
         <result column="guide_comment" property="guideComment" jdbcType="VARCHAR"/>
@@ -21,22 +21,40 @@
         <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
     </resultMap>
-    <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanHmPage">
+    <sql id="Base_Column_List">
+        template_id
+        , template_code, template_name, enterprise_id, wx_enterprise_id, status,
+    page_title, merchant_name, merchant_phone_number, merchant_logo, page_backgroud_img, 
+    guide_comment, createor_id, createor_name, modifier_id, modifier_name, create_time, 
+    update_time
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_hm_page
+        where template_id = #{templateId,jdbcType=BIGINT}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete
+        from tab_haoban_hm_page
+        where template_id = #{templateId,jdbcType=BIGINT}
+    </delete>
+    <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPage">
         insert into tab_haoban_hm_page (template_id, template_code, template_name,
                                         enterprise_id, wx_enterprise_id, status,
-                                        page_title, merchant_name, merchant_phone_numer,
+                                        page_title, merchant_name, merchant_phone_number,
                                         merchant_logo, page_backgroud_img, guide_comment,
                                         createor_id, createor_name, modifier_id,
                                         modifier_name, create_time, update_time)
         values (#{templateId,jdbcType=BIGINT}, #{templateCode,jdbcType=CHAR}, #{templateName,jdbcType=VARCHAR},
                 #{enterpriseId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
-                #{pageTitle,jdbcType=VARCHAR}, #{merchantName,jdbcType=VARCHAR}, #{merchantPhoneNumer,jdbcType=VARCHAR},
+                #{pageTitle,jdbcType=VARCHAR}, #{merchantName,jdbcType=VARCHAR}, #{merchantPhoneNumber,jdbcType=VARCHAR},
                 #{merchantLogo,jdbcType=VARCHAR}, #{pageBackgroudImg,jdbcType=VARCHAR},
                 #{guideComment,jdbcType=VARCHAR},
                 #{createorId,jdbcType=VARCHAR}, #{createorName,jdbcType=VARCHAR}, #{modifierId,jdbcType=VARCHAR},
                 #{modifierName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
     </insert>
-    <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanHmPage">
+    <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPage">
         insert into tab_haoban_hm_page
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="templateId != null">
@@ -63,8 +81,8 @@
             <if test="merchantName != null">
                 merchant_name,
             </if>
-            <if test="merchantPhoneNumer != null">
-                merchant_phone_numer,
+            <if test="merchantPhoneNumber != null">
+                merchant_phone_number,
             </if>
             <if test="merchantLogo != null">
                 merchant_logo,
@@ -119,8 +137,8 @@
             <if test="merchantName != null">
                 #{merchantName,jdbcType=VARCHAR},
             </if>
-            <if test="merchantPhoneNumer != null">
-                #{merchantPhoneNumer,jdbcType=VARCHAR},
+            <if test="merchantPhoneNumber != null">
+                #{merchantPhoneNumber,jdbcType=VARCHAR},
             </if>
             <if test="merchantLogo != null">
                 #{merchantLogo,jdbcType=VARCHAR},
@@ -151,4 +169,82 @@
             </if>
         </trim>
     </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPage">
+        update tab_haoban_hm_page
+        <set>
+            <if test="templateCode != null">
+                template_code = #{templateCode,jdbcType=CHAR},
+            </if>
+            <if test="templateName != null">
+                template_name = #{templateName,jdbcType=VARCHAR},
+            </if>
+            <if test="enterpriseId != null">
+                enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
+            </if>
+            <if test="wxEnterpriseId != null">
+                wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null">
+                status = #{status,jdbcType=INTEGER},
+            </if>
+            <if test="pageTitle != null">
+                page_title = #{pageTitle,jdbcType=VARCHAR},
+            </if>
+            <if test="merchantName != null">
+                merchant_name = #{merchantName,jdbcType=VARCHAR},
+            </if>
+            <if test="merchantPhoneNumber != null">
+                merchant_phone_number = #{merchantPhoneNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="merchantLogo != null">
+                merchant_logo = #{merchantLogo,jdbcType=VARCHAR},
+            </if>
+            <if test="pageBackgroudImg != null">
+                page_backgroud_img = #{pageBackgroudImg,jdbcType=VARCHAR},
+            </if>
+            <if test="guideComment != null">
+                guide_comment = #{guideComment,jdbcType=VARCHAR},
+            </if>
+            <if test="createorId != null">
+                createor_id = #{createorId,jdbcType=VARCHAR},
+            </if>
+            <if test="createorName != null">
+                createor_name = #{createorName,jdbcType=VARCHAR},
+            </if>
+            <if test="modifierId != null">
+                modifier_id = #{modifierId,jdbcType=VARCHAR},
+            </if>
+            <if test="modifierName != null">
+                modifier_name = #{modifierName,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+        </set>
+        where template_id = #{templateId,jdbcType=BIGINT}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPage">
+        update tab_haoban_hm_page
+        set template_code        = #{templateCode,jdbcType=CHAR},
+            template_name        = #{templateName,jdbcType=VARCHAR},
+            enterprise_id        = #{enterpriseId,jdbcType=VARCHAR},
+            wx_enterprise_id     = #{wxEnterpriseId,jdbcType=VARCHAR},
+            status               = #{status,jdbcType=INTEGER},
+            page_title           = #{pageTitle,jdbcType=VARCHAR},
+            merchant_name        = #{merchantName,jdbcType=VARCHAR},
+            merchant_phone_number = #{merchantPhoneNumber,jdbcType=VARCHAR},
+            merchant_logo        = #{merchantLogo,jdbcType=VARCHAR},
+            page_backgroud_img   = #{pageBackgroudImg,jdbcType=VARCHAR},
+            guide_comment        = #{guideComment,jdbcType=VARCHAR},
+            createor_id          = #{createorId,jdbcType=VARCHAR},
+            createor_name        = #{createorName,jdbcType=VARCHAR},
+            modifier_id          = #{modifierId,jdbcType=VARCHAR},
+            modifier_name        = #{modifierName,jdbcType=VARCHAR},
+            create_time          = #{createTime,jdbcType=TIMESTAMP},
+            update_time          = #{updateTime,jdbcType=TIMESTAMP}
+        where template_id = #{templateId,jdbcType=BIGINT}
+    </update>
 </mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmPageRelationMapper">
+    <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation">
+        <id column="relation_id" property="relationId" jdbcType="BIGINT"/>
+        <result column="page_template_code" property="pageTemplateCode" jdbcType="VARCHAR"/>
+        <result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR"/>
+        <result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR"/>
+        <result column="refer_id" property="referId" jdbcType="VARCHAR"/>
+        <result column="refer_name" property="referName" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="type" property="type" jdbcType="INTEGER"/>
+        <result column="status" property="status" jdbcType="INTEGER"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        relation_id
+        , page_template_code, enterprise_id, wx_enterprise_id, refer_id, refer_name,
+    create_time, update_time, type, status
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_hm_page_releation
+        where relation_id = #{relationId,jdbcType=BIGINT}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete
+        from tab_haoban_hm_page_releation
+        where relation_id = #{relationId,jdbcType=BIGINT}
+    </delete>
+    <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation">
+        insert into tab_haoban_hm_page_releation (relation_id, page_template_code, enterprise_id,
+                                                  wx_enterprise_id, refer_id, refer_name,
+                                                  create_time, update_time, type,
+                                                  status)
+        values (#{relationId,jdbcType=BIGINT}, #{pageTemplateCode,jdbcType=VARCHAR}, #{enterpriseId,jdbcType=VARCHAR},
+                #{wxEnterpriseId,jdbcType=VARCHAR}, #{referId,jdbcType=VARCHAR}, #{referName,jdbcType=VARCHAR},
+                #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{type,jdbcType=INTEGER},
+                #{status,jdbcType=INTEGER})
+    </insert>
+    <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation">
+        insert into tab_haoban_hm_page_releation
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="relationId != null">
+                relation_id,
+            </if>
+            <if test="pageTemplateCode != null">
+                page_template_code,
+            </if>
+            <if test="enterpriseId != null">
+                enterprise_id,
+            </if>
+            <if test="wxEnterpriseId != null">
+                wx_enterprise_id,
+            </if>
+            <if test="referId != null">
+                refer_id,
+            </if>
+            <if test="referName != null">
+                refer_name,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="type != null">
+                type,
+            </if>
+            <if test="status != null">
+                status,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="relationId != null">
+                #{relationId,jdbcType=BIGINT},
+            </if>
+            <if test="pageTemplateCode != null">
+                #{pageTemplateCode,jdbcType=VARCHAR},
+            </if>
+            <if test="enterpriseId != null">
+                #{enterpriseId,jdbcType=VARCHAR},
+            </if>
+            <if test="wxEnterpriseId != null">
+                #{wxEnterpriseId,jdbcType=VARCHAR},
+            </if>
+            <if test="referId != null">
+                #{referId,jdbcType=VARCHAR},
+            </if>
+            <if test="referName != null">
+                #{referName,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="type != null">
+                #{type,jdbcType=INTEGER},
+            </if>
+            <if test="status != null">
+                #{status,jdbcType=INTEGER},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective"
+            parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation">
+        update tab_haoban_hm_page_releation
+        <set>
+            <if test="pageTemplateCode != null">
+                page_template_code = #{pageTemplateCode,jdbcType=VARCHAR},
+            </if>
+            <if test="enterpriseId != null">
+                enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
+            </if>
+            <if test="wxEnterpriseId != null">
+                wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
+            </if>
+            <if test="referId != null">
+                refer_id = #{referId,jdbcType=VARCHAR},
+            </if>
+            <if test="referName != null">
+                refer_name = #{referName,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="type != null">
+                type = #{type,jdbcType=INTEGER},
+            </if>
+            <if test="status != null">
+                status = #{status,jdbcType=INTEGER},
+            </if>
+        </set>
+        where relation_id = #{relationId,jdbcType=BIGINT}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation">
+        update tab_haoban_hm_page_releation
+        set page_template_code = #{pageTemplateCode,jdbcType=VARCHAR},
+            enterprise_id      = #{enterpriseId,jdbcType=VARCHAR},
+            wx_enterprise_id   = #{wxEnterpriseId,jdbcType=VARCHAR},
+            refer_id           = #{referId,jdbcType=VARCHAR},
+            refer_name         = #{referName,jdbcType=VARCHAR},
+            create_time        = #{createTime,jdbcType=TIMESTAMP},
+            update_time        = #{updateTime,jdbcType=TIMESTAMP},
+            type               = #{type,jdbcType=INTEGER},
+            status             = #{status,jdbcType=INTEGER}
+        where relation_id = #{relationId,jdbcType=BIGINT}
+    </update>
+</mapper>
\ No newline at end of file

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

+package com.gic.haoban.manage.web.controller.hm;
+
+import com.gic.haoban.base.api.common.ServiceResponse;
+import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
+import com.gic.haoban.common.utils.AuthWebRequestUtil;
+import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.hm.HmGroupDTO;
+import com.gic.haoban.manage.api.service.hm.HmGroupApiService;
+import com.gic.haoban.manage.web.controller.WebBaseController;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.vo.hm.HmGroupSettingVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/1 4:31 PM
+ * @Description
+ * @Version
+ **/
+@RestController
+@RequestMapping(path = "/hm/group")
+public class HmGroupController extends WebBaseController {
+
+    //@Autowired
+    private HmGroupApiService groupApiService;
+
+    @RequestMapping(path = "/save", method = RequestMethod.POST)
+    public HaobanResponse saveHmGroupSetting(@Valid HmGroupSettingVO hmGroupSettingVO){
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        HmGroupDTO hmGroupDTO = new HmGroupDTO();
+        hmGroupDTO.setGroupName(hmGroupSettingVO.getGroupName());
+        hmGroupDTO.setCreatorId(loginUser.getHanbaoUserId());
+        hmGroupDTO.setCreatorName(loginUser.getClerkName());
+        hmGroupDTO.setEnterpriseId(loginUser.getEnterpriseId());
+        hmGroupDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
+        ServiceResponse<Long> serviceResponse = groupApiService.saveOrUpdateHmGroupSetting(hmGroupDTO);
+        return resultResponse(HaoBanErrCode.ERR_1, serviceResponse.getResult());
+    }
+}

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

+package com.gic.haoban.manage.web.vo.hm;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import java.io.Serializable;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/1 4:33 PM
+ * @Description
+ * @Version
+ **/
+public class HmGroupSettingVO implements Serializable {
+
+    @NotEmpty(message = "活码分组名字不能为空")
+    private String groupName;
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+}