feat: 活码落地页相关

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

+package com.gic.haoban.manage.api.enums;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/4 3:30 PM
+ * @Description
+ * @Version
+ **/
+public enum WelcomeRelationStatusEnum {
+
+    /**
+     * 启用
+     */
+    ENABLE(1, "启用"),
+
+    /**
+     * 删除
+     */
+    DISABLE(0, "删除"),
+    /**
+     * 废弃
+     */
+    DEPRECATED(2, "废弃");
+
+    WelcomeRelationStatusEnum(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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.dao.mapper;
 
 import com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation;
 import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -24,4 +25,8 @@ public interface TabHaobanWelcomeTemplateRelationMapper {
      * @return
      */
     List<TabHaobanWelcomeTemplateRelation> queryWelcomeTemplate(WelcomeRelationQO welcomeRelationQO);
+
+    TabHaobanWelcomeTemplateRelation queryWelTemplateRelation(@Param("welcomeId") String welcomeId,
+                                                              @Param("referId") String referId,
+                                                              @Param("status") Integer status);
 }
\ No newline at end of file

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

@@ -19,6 +19,9 @@ public class TabHaobanWelcomeTemplateRelation {
 
     private Date updateTime;
 
+    /**
+     * @see com.gic.haoban.manage.api.enums.hm.HmWelcomeReferType
+     */
     private Integer type;
 
     private Integer status;

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

@@ -39,4 +39,52 @@ public class HmWelcomeRelationBO implements Serializable {
      * @see HmWelcomeReferType
      */
     private Integer type;
+
+    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 getWelcomeId() {
+        return welcomeId;
+    }
+
+    public void setWelcomeId(String welcomeId) {
+        this.welcomeId = welcomeId;
+    }
+
+    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/service/WelcomeService.java

@@ -119,6 +119,7 @@ public interface WelcomeService {
 
     /**
      * 条件查询
+     *
      * @param queryWelcomeQDTO
      * @return
      */
@@ -126,16 +127,12 @@ public interface WelcomeService {
 
 
     /**
-     * desc: 根据员工所在部门匹配欢迎语
-     *
-     * @param staffId        员工id
-     * @param wxEnterpriseId 微信企业id
+     * 根据 关联关系获取对应的欢迎语
      *
-     * @see com.gic.haoban.manage.api.enums.hm.HmWelcomeType
-     * @param type
-     * @return : {@link WelcomeDetailBO}
-     * @author : YongEn
-     * @date : 2022/2/9
+     * @param staffId
+     * @param wxEnterpriseId
+     * @param referId        活码/链接 code
+     * @return
      */
-    WelcomeDetailBO getMatchWelcomeWithType(String staffId, String wxEnterpriseId, Integer type);
+    WelcomeDetailBO getMatchWelcomeWithReferId(String staffId, String wxEnterpriseId, String referId);
 }

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

@@ -26,11 +26,13 @@ public interface HmWelComeService {
     Boolean saveHmWelcomeRelation(HmWelcomeRelationBO hmWelcomeRelationBO);
 
     /**
-     * 删除关联关系
-     * @param welcomeId
+     * 修改关联关系状态
+     *
+     * @param referId
+     * @param status
+     *
+     * @see com.gic.haoban.manage.api.enums.WelcomeRelationStatusEnum
      * @return
      */
-    Boolean deleteWelcomeRelation(Long welcomeId);
-
-
+    Boolean updateWelcomeRelationStatus(String referId, Integer status);
 }

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.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/4 5:49 PM
+ * @Description
+ * @Version
+ **/
+public interface WelcomeRelationService {
+
+    /**
+     * 查询欢迎语关联关系
+     * @param referId
+     * @param status
+     * @return
+     */
+    TabHaobanWelcomeTemplateRelation queryWelcomeRelation(String referId, Integer status);
+}

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

 package com.gic.haoban.manage.service.service.hm.impl;
 
+import com.gic.commons.util.UniqueIdUtils;
+import com.gic.haoban.manage.api.enums.WelcomeRelationStatusEnum;
+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.bo.welcome.WelcomeDetailBO;
+import com.gic.haoban.manage.service.service.WelcomeService;
 import com.gic.haoban.manage.service.service.hm.HmWelComeService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
 
 /**
  * @Author MUSI
@@ -14,6 +23,12 @@ import org.springframework.stereotype.Component;
 @Component
 public class HmWelComeServiceImpl implements HmWelComeService {
 
+    @Autowired
+    private TabHaobanWelcomeTemplateRelationMapper welcomeTemplateRelationMapper;
+
+    @Autowired
+    private WelcomeService welcomeService;
+
     /**
      * 根据 关联方的code 获取关联的欢迎语
      *
@@ -22,7 +37,11 @@ public class HmWelComeServiceImpl implements HmWelComeService {
      */
     @Override
     public WelcomeDetailBO queryHmWelcomeWithReferId(String referId) {
-        return null;
+        TabHaobanWelcomeTemplateRelation welcomeTemplateRelation = welcomeTemplateRelationMapper.queryWelTemplateRelation(null, referId, WelcomeRelationStatusEnum.ENABLE.getCode());
+        if (welcomeTemplateRelation == null) {
+            return null;
+        }
+        return welcomeService.getWelcome(welcomeTemplateRelation.getWelcomeId(), welcomeTemplateRelation.getEnterpriseId());
     }
 
     /**
@@ -32,18 +51,43 @@ public class HmWelComeServiceImpl implements HmWelComeService {
      * @return
      */
     @Override
+    @Transactional(rollbackFor = RuntimeException.class)
     public Boolean saveHmWelcomeRelation(HmWelcomeRelationBO hmWelcomeRelationBO) {
-        return null;
+        TabHaobanWelcomeTemplateRelation welcomeTemplateRelation = new TabHaobanWelcomeTemplateRelation();
+        welcomeTemplateRelation.setRelationId(UniqueIdUtils.uniqueLong());
+        welcomeTemplateRelation.setEnterpriseId(hmWelcomeRelationBO.getEnterpriseId());
+        welcomeTemplateRelation.setWxEnterpriseId(hmWelcomeRelationBO.getWxEnterpriseId());
+        welcomeTemplateRelation.setWelcomeId(hmWelcomeRelationBO.getWelcomeId());
+        welcomeTemplateRelation.setReferId(hmWelcomeRelationBO.getReferId());
+        welcomeTemplateRelation.setReferName(hmWelcomeRelationBO.getReferName());
+        welcomeTemplateRelation.setType(hmWelcomeRelationBO.getType());
+        welcomeTemplateRelation.setStatus(WelcomeRelationStatusEnum.ENABLE.getCode());
+        welcomeTemplateRelation.setCreateTime(new Date());
+        welcomeTemplateRelation.setUpdateTime(new Date());
+        welcomeTemplateRelationMapper.insertSelective(welcomeTemplateRelation);
+        return Boolean.TRUE;
     }
 
     /**
      * 删除关联关系
+     * 此处事务 为了事务传播
      *
-     * @param welcomeId
+     * @param referId
      * @return
      */
     @Override
-    public Boolean deleteWelcomeRelation(Long welcomeId) {
-        return null;
+    @Transactional(rollbackFor = RuntimeException.class)
+    public Boolean updateWelcomeRelationStatus(String referId, Integer status) {
+
+        TabHaobanWelcomeTemplateRelation welcomeTemplateRelation = welcomeTemplateRelationMapper.queryWelTemplateRelation(null, referId, WelcomeRelationStatusEnum.ENABLE.getCode());
+        if (welcomeTemplateRelation == null) {
+            return Boolean.FALSE;
+        }
+        TabHaobanWelcomeTemplateRelation temp = new TabHaobanWelcomeTemplateRelation();
+        temp.setRelationId(welcomeTemplateRelation.getRelationId());
+        temp.setUpdateTime(new Date());
+        temp.setStatus(status);
+        welcomeTemplateRelationMapper.updateByPrimaryKeySelective(temp);
+        return Boolean.TRUE;
     }
 }

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.haoban.manage.service.dao.mapper.TabHaobanWelcomeTemplateRelationMapper;
+import com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation;
+import com.gic.haoban.manage.service.service.hm.WelcomeRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/4 5:50 PM
+ * @Description
+ * @Version
+ **/
+@Component
+public class WelcomeRelationServiceImpl implements WelcomeRelationService {
+
+    @Autowired
+    private TabHaobanWelcomeTemplateRelationMapper welcomeTemplateRelationMapper;
+
+    /**
+     * 查询欢迎语关联关系
+     *
+     * @param referId
+     * @param status
+     * @return
+     */
+    @Override
+    public TabHaobanWelcomeTemplateRelation queryWelcomeRelation(String referId, Integer status) {
+        return welcomeTemplateRelationMapper.queryWelTemplateRelation(null, referId, status);
+    }
+}

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

@@ -7,14 +7,18 @@ import com.gic.haoban.common.utils.StringUtil;
 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;
+import com.gic.haoban.manage.api.enums.WelcomeRelationStatusEnum;
 import com.gic.haoban.manage.api.enums.WelcomeSuitTypeEnum;
+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.welcome.*;
 import com.gic.haoban.manage.service.pojo.qo.WelcomeInfoQO;
 import com.gic.haoban.manage.service.service.WelcomeService;
 import com.gic.haoban.manage.service.service.WelcomeSuitRangService;
+import com.gic.haoban.manage.service.service.hm.WelcomeRelationService;
 import com.github.pagehelper.PageHelper;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -51,6 +55,8 @@ public class WelcomeServiceImpl implements WelcomeService {
     private StaffDepartmentRelatedMapper staffDepartmentRelatedMapper;
     @Autowired
     private TabMiniprogramSettingMapper miniprogramSettingMapper;
+    @Autowired
+    private WelcomeRelationService welcomeRelationService;
 
     private static final int WELCOME_LIMIT = 50;
     private static final int DEPARTMENT_NUM_LIMIT = 10000;
@@ -625,17 +631,17 @@ public class WelcomeServiceImpl implements WelcomeService {
         return tPage;
     }
 
-    /**
-     * desc: 根据员工所在部门匹配欢迎语
-     *
-     * @param staffId        员工id
-     * @param wxEnterpriseId 微信企业id
-     * @return : {@link WelcomeDetailBO}
-     * @author : YongEn
-     * @date : 2022/2/9
-     */
     @Override
-    public WelcomeDetailBO getMatchWelcomeWithType(String staffId, String wxEnterpriseId, Integer type) {
-        return queryMatchWelcome(staffId, wxEnterpriseId, type);
+    public WelcomeDetailBO getMatchWelcomeWithReferId(String staffId, String wxEnterpriseId, String referId) {
+        logger.info("[getMatchWelcomeWithReferId] staffId:{}, wxEnterpriseId:{}, referId:{}",
+                staffId, wxEnterpriseId, referId);
+        // 根据referId 查询 关联关系表
+        TabHaobanWelcomeTemplateRelation welcomeTemplateRelation = welcomeRelationService.queryWelcomeRelation(referId, WelcomeRelationStatusEnum.ENABLE.getCode());
+        if (welcomeTemplateRelation == null){
+            // 不存在
+            return null;
+        }
+        TabWelcome tabWelcome = welcomeMapper.selectByPrimaryKey(welcomeTemplateRelation.getWelcomeId());
+        return convertWelcomeToBo(tabWelcome);
     }
 }

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

@@ -55,12 +55,12 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
             serviceResponse.setCode(HaoBanErrCodeCommon.ERR_5.getCode());
             return serviceResponse;
         }
-        HmGroupInfoQO groupInfoQO = new HmGroupInfoQO();
-        groupInfoQO.setGroupName(hmGroupDTO.getGroupName());
-        groupInfoQO.setStatus(HmGroupStatus.ENABLE.getCode());
-        groupInfoQO.setEnterpriseId(hmGroupDTO.getEnterpriseId());
-        groupInfoQO.setWxEnterpriseId(groupInfoQO.getWxEnterpriseId());
-        List<TabHaobanHmGroupSetting> tabHaobanHmGroupSettings = haobanHmGroupSettingMapper.queryHmGroupSettingList(groupInfoQO);
+        HmGroupInfoQO groupInfoQo = new HmGroupInfoQO();
+        groupInfoQo.setGroupName(hmGroupDTO.getGroupName());
+        groupInfoQo.setStatus(HmGroupStatus.ENABLE.getCode());
+        groupInfoQo.setEnterpriseId(hmGroupDTO.getEnterpriseId());
+        groupInfoQo.setWxEnterpriseId(groupInfoQo.getWxEnterpriseId());
+        List<TabHaobanHmGroupSetting> tabHaobanHmGroupSettings = haobanHmGroupSettingMapper.queryHmGroupSettingList(groupInfoQo);
         if (hmGroupDTO.getGroupId() == null) {
             // insert
             // check groupName unique
@@ -127,7 +127,7 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
                 (com.github.pagehelper.Page<TabHaobanHmGroupSetting>) haobanHmGroupSettingMapper.queryHmGroupSettingList(groupInfoQo);
         Page<HmGroupDTO> hmGroupInfoPage = PageUtil.changePageHelperToCurrentPage(tabHaobanHmGroupSettings, HmGroupDTO.class);
 
-        // query 活码 默认分组的总数
+        // todo query 活码 默认分组的总数
         List<HmGroupDTO> result = new ArrayList<>();
         result.add(buildDefault(null));
         if (CollectionUtils.isNotEmpty(hmGroupInfoPage.getResult())){
@@ -174,6 +174,7 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
         tempGroupSetting.setModifierName(groupDTO.getModifierName());
         tempGroupSetting.setUpdateTime(new Date());
         serviceResponse.setResult(haobanHmGroupSettingMapper.updateByPrimaryKeySelective(tempGroupSetting) == 1);
+        // todo log
         return serviceResponse;
     }
 
@@ -188,6 +189,7 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
     public ServiceResponse<Integer> queryGroupReferCount(String enterpriseId, String wxEnterpriseId) {
         ServiceResponse<Integer> serviceResponse = new ServiceResponse<>();
         serviceResponse.setResult(0);
+        // todo query 分组引用的总数
         return serviceResponse;
     }
 }

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

@@ -42,6 +42,8 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
 
     private static final Logger log = LoggerFactory.getLogger(HmPageTemplateApiServiceImpl.class);
 
+    private static final String TEMPLATE_CODE_PREFIX = "MB01";
+
     @Autowired
     private TabHaobanHmPageMapper haobanHmPageMapper;
     @Autowired
@@ -55,8 +57,7 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
             // save
             TabHaobanHmPage haobanHmPage = new TabHaobanHmPage();
             BeanUtils.copyProperties(pageTemplateDTO, haobanHmPage);
-            // todo
-            haobanHmPage.setTemplateCode("");
+            haobanHmPage.setTemplateCode(this.generatorTemplateCode());
             haobanHmPage.setTemplateId(UniqueIdUtils.uniqueLong());
             haobanHmPage.setCreateorId(pageTemplateDTO.getClerkId());
             haobanHmPage.setCreateorName(pageTemplateDTO.getClerkName());
@@ -169,4 +170,12 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
         serviceResponse.setResult(PageUtil.changeToCurrentPage(hmPageRelationPage, HmPageRelationRespDTO.class));
         return serviceResponse;
     }
+
+    /**
+     * 生成模板code
+     * @return
+     */
+    private String generatorTemplateCode(){
+        return TEMPLATE_CODE_PREFIX + UniqueIdUtils.uniqueLong();
+    }
 }

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

@@ -158,11 +158,23 @@
 
     <select id="queryWelcomeTemplate" resultMap="BaseResultMap">
         select <include refid="Base_Column_List"/>
-        from update tab_haoban_welcome_template_relation
+        from tab_haoban_welcome_template_relation
         <where>
             <if test="welcomeId != null">
                 and welcome_id = #{welcomeId}
             </if>
         </where>
     </select>
+
+    <select id="queryWelTemplateRelation" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List"/>
+        from tab_haoban_welcome_template_relation
+        where refer_id = #{referId}
+        <if test="welcomeId != null">
+            and welcome_id = #{welcomeId}
+        </if>
+        <if test="status != null">
+            and `status` = #{status}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file

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

 package com.gic.haoban.manage.web.controller;
 
 import com.gic.api.base.commons.Constant;
+import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.haoban.base.api.common.PageResult2;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
+import com.gic.haoban.common.utils.PageUtil;
+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.qdto.QueryWelcomeQDTO;
+import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeRelationQDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.SaveFriendSettingQDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.SaveWelcomeMediaQDTO;
 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.qo.welcome.ListWelcomeQO;
 import com.gic.haoban.manage.web.qo.welcome.SaveFriendSettingQO;
@@ -36,6 +44,9 @@ public class WelcomeController extends WebBaseController {
     @Autowired
     private WelcomeApiService welcomeApiService;
 
+    @Autowired
+    private HmWelcomeRelationApiService welcomeRelationApiService;
+
 
     /**
      * desc: 校验企业是否存在全员欢迎语
@@ -77,6 +88,10 @@ public class WelcomeController extends WebBaseController {
         qdto.setCreatorName(login.getClerkFullName());
         qdto.setModifierId(login.getClerkId());
         qdto.setModifierName(login.getClerkFullName());
+        qdto.setType(qo.getType());
+        if (qo.getType() == null) {
+            qdto.setType(HmWelcomeType.NORMAL.getCode());
+        }
         ServiceResponse<Boolean> response = welcomeApiService.saveWelcome(qdto);
         return RestResponse.successResult(response.getResult());
     }
@@ -107,9 +122,20 @@ public class WelcomeController extends WebBaseController {
      * @date : 2022/2/11
      */
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public RestResponse<List<WelcomeListDTO>> listWelcome(@RequestBody @Valid ListWelcomeQO qo) {
-        ServiceResponse<List<WelcomeListDTO>> response = welcomeApiService.listWelcome(qo.getWxEnterpriseId(), qo.getTitle());
-        return RestResponse.successResult(response.getResult());
+    public RestResponse<PageResult2<WelcomeListDTO>> listWelcome(@RequestBody @Valid ListWelcomeQO qo) {
+        QueryWelcomeQDTO queryWelcomeQDTO = new QueryWelcomeQDTO();
+        queryWelcomeQDTO.setTitle(qo.getTitle());
+        queryWelcomeQDTO.setWxEnterpriseId(qo.getWxEnterpriseId());
+        queryWelcomeQDTO.setPageNum(qo.getPageNum());
+        queryWelcomeQDTO.setPageSize(qo.getPageSize());
+        queryWelcomeQDTO.setType(qo.getType());
+        if (qo.getType() == null) {
+            queryWelcomeQDTO.setType(HmWelcomeType.NORMAL.getCode());
+        }
+        ServiceResponse<Page<WelcomeListDTO>> serviceResponse = welcomeApiService.listWelcomeWithCondition(queryWelcomeQDTO);
+        Page<WelcomeListDTO> result = serviceResponse.getResult();
+        PageResult2 pageInfo = PageUtil.getPageInfo(result);
+        return RestResponse.successResult(pageInfo);
     }
 
     /**
@@ -192,4 +218,20 @@ public class WelcomeController extends WebBaseController {
         return RestResponse.successResult(response.getResult());
     }
 
+    @RequestMapping(path = "/relation/list")
+    public RestResponse<PageResult2<HmWelcomeRelationDTO>> queryWelcomeRelationList(@RequestParam("welcomeId") Long welcomeId,
+                                                                                   @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()){
+            Page<HmWelcomeRelationDTO> result = serviceResponse.getResult();
+            return RestResponse.successResult(PageUtil.getPageInfo(result));
+        }
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+    }
+
 }

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.api.base.commons.Page;
+import com.gic.haoban.base.api.common.PageResult2;
 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.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.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.qo.hm.HmGroupQO;
 import com.gic.haoban.manage.web.vo.hm.HmGroupSettingVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Author MUSI
@@ -26,7 +33,7 @@ import javax.validation.Valid;
 @RequestMapping(path = "/hm/group")
 public class HmGroupController extends WebBaseController {
 
-    //@Autowired
+    @Autowired
     private HmGroupApiService groupApiService;
 
     @RequestMapping(path = "/save", method = RequestMethod.POST)
@@ -41,4 +48,53 @@ public class HmGroupController extends WebBaseController {
         ServiceResponse<Long> serviceResponse = groupApiService.saveOrUpdateHmGroupSetting(hmGroupDTO);
         return resultResponse(HaoBanErrCode.ERR_1, serviceResponse.getResult());
     }
+
+    @RequestMapping(path = "/list")
+    public HaobanResponse queryHmGroupList(HmGroupQO hmGroupQo){
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        String wxEnterpriseId = loginUser.getWxEnterpriseId();
+        String enterpriseId = loginUser.getEnterpriseId();
+        HmGroupQueryDTO hmGroupQueryDTO = new HmGroupQueryDTO();
+        hmGroupQueryDTO.setGroupName(hmGroupQo.getGroupName());
+        hmGroupQueryDTO.setPageNum(hmGroupQo.getPageNum());
+        hmGroupQueryDTO.setPageSize(hmGroupQo.getPageSize());
+        hmGroupQueryDTO.setWxEnterpriseId(wxEnterpriseId);
+        hmGroupQueryDTO.setEnterpriseId(enterpriseId);
+        ServiceResponse<Page<HmGroupDTO>> serviceResponse = groupApiService.queryHmGroupSettingList(hmGroupQueryDTO);
+        PageResult2 pageInfo = PageUtil.getPageInfo(serviceResponse.getResult());
+        return resultResponse(HaoBanErrCode.ERR_1, pageInfo);
+    }
+
+    @RequestMapping(path = "/edit", method = RequestMethod.POST)
+    public HaobanResponse editHmGroupSetting(@Valid HmGroupSettingVO hmGroupSettingVO){
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        HmGroupDTO hmGroupDTO = new HmGroupDTO();
+        hmGroupDTO.setGroupName(hmGroupSettingVO.getGroupName());
+        hmGroupDTO.setModifierId(loginUser.getClerkId());
+        hmGroupDTO.setModifierName(loginUser.getClerkName());
+        hmGroupDTO.setGroupId(hmGroupSettingVO.getGroupId());
+        ServiceResponse<Long> serviceResponse = groupApiService.saveOrUpdateHmGroupSetting(hmGroupDTO);
+        return resultResponse(HaoBanErrCode.ERR_1, serviceResponse.getResult());
+    }
+
+    @RequestMapping(path = "/delete", method = RequestMethod.POST)
+    public HaobanResponse deleteHmGroupSetting(HmGroupSettingVO hmGroupSettingVO){
+        if (hmGroupSettingVO.getGroupId() == null){
+            return resultResponse(HaoBanErrCode.ERR_2);
+        }
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        HmGroupDTO hmGroupDTO = new HmGroupDTO();
+        hmGroupDTO.setModifierId(loginUser.getClerkId());
+        hmGroupDTO.setModifierName(loginUser.getClerkName());
+        hmGroupDTO.setGroupId(hmGroupSettingVO.getGroupId());
+        ServiceResponse<Boolean> serviceResponse = groupApiService.deleteGroupSetting(hmGroupDTO);
+        return resultResponse(HaoBanErrCode.ERR_1, serviceResponse.getResult());
+    }
+
+    @RequestMapping(path = "/refer/count")
+    public HaobanResponse queryGroupTotalReferCount(){
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        ServiceResponse<Integer> serviceResponse = groupApiService.queryGroupReferCount(loginUser.getEnterpriseId(), loginUser.getWxEnterpriseId());
+        return resultResponse(HaoBanErrCode.ERR_1, serviceResponse.getResult());
+    }
 }

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

+package com.gic.haoban.manage.web.controller.hm;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/4 1:58 PM
+ * @Description
+ * @Version
+ **/
+@RestController
+@RequestMapping(path = "/hm/guide/")
+public class HmPageTemplateController {
+
+
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/HmGroupQO.java

+package com.gic.haoban.manage.web.qo.hm;
+
+import com.gic.haoban.base.api.common.BasePageInfo;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/4 11:18 AM
+ * @Description
+ * @Version
+ **/
+
+public class HmGroupQO extends BasePageInfo {
+
+    private String groupName;
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/welcome/ListWelcomeQO.java

 package com.gic.haoban.manage.web.qo.welcome;
 
+import com.gic.haoban.base.api.common.BasePageInfo;
 import org.hibernate.validator.constraints.NotEmpty;
 
 import java.io.Serializable;
@@ -10,7 +11,7 @@ import java.io.Serializable;
  * @author: YongEn
  * @date: 2022/2/9
  **/
-public class ListWelcomeQO implements Serializable {
+public class ListWelcomeQO extends BasePageInfo {
     private static final long serialVersionUID = 5543264430718991071L;
 
     /**
@@ -23,6 +24,12 @@ public class ListWelcomeQO implements Serializable {
      */
     private String title;
 
+    /**
+     * 欢迎语类型
+     * @see com.gic.haoban.manage.api.enums.hm.HmWelcomeType
+     */
+    private Integer type;
+
     public String getWxEnterpriseId() {
         return wxEnterpriseId;
     }
@@ -39,6 +46,14 @@ public class ListWelcomeQO implements Serializable {
         this.title = title;
     }
 
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
     @Override
     public String toString() {
         return "ListWelcomeQO{" +

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/welcome/SaveWelcomeQO.java

@@ -59,6 +59,11 @@ public class SaveWelcomeQO implements Serializable {
      */
     private List<WelcomeSuitStaffDTO> suitStaffDeleteList;
 
+    /**
+     * @see com.gic.haoban.manage.api.enums.hm.HmWelcomeType
+     */
+    private Integer type;
+
     public String getWelcomeId() {
         return welcomeId;
     }
@@ -139,6 +144,14 @@ public class SaveWelcomeQO implements Serializable {
         this.suitStaffDeleteList = suitStaffDeleteList;
     }
 
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
     @Override
     public String toString() {
         return "SaveWelcomeQO{" +

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

@@ -15,6 +15,17 @@ public class HmGroupSettingVO implements Serializable {
     @NotEmpty(message = "活码分组名字不能为空")
     private String groupName;
 
+    private Long groupId;
+
+    private Integer referNum;
+
+    /**
+     * 是否为默认分组
+     * 1 是默认分组
+     * 0 不是默认分组
+     */
+    private Integer defaultFlag;
+
     public String getGroupName() {
         return groupName;
     }
@@ -22,4 +33,28 @@ public class HmGroupSettingVO implements Serializable {
     public void setGroupName(String groupName) {
         this.groupName = groupName;
     }
+
+    public Long getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Long groupId) {
+        this.groupId = groupId;
+    }
+
+    public Integer getReferNum() {
+        return referNum;
+    }
+
+    public void setReferNum(Integer referNum) {
+        this.referNum = referNum;
+    }
+
+    public Integer getDefaultFlag() {
+        return defaultFlag;
+    }
+
+    public void setDefaultFlag(Integer defaultFlag) {
+        this.defaultFlag = defaultFlag;
+    }
 }

haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml

@@ -100,5 +100,12 @@
 	<dubbo:reference id="clerkMoveService"   interface="com.gic.clerk.api.service.ClerkMoveService" timeout="10000" retries="0" check="false" />
 	<dubbo:reference id="storeWidgetService" interface="com.gic.enterprise.api.service.StoreWidgetService" timeout="10000" retries="0" check="false" />
 	<dubbo:reference id="hmLinkApiService" interface="com.gic.haoban.manage.api.service.hm.HmLinkApiService" timeout="10000" retries="0" check="false" />
+
+	<dubbo:reference id="hmGroupApiService" interface="com.gic.haoban.manage.api.service.hm.HmGroupApiService"
+					 timeout="10000" retries="0" check="false" />
+	<dubbo:reference id="hmPageTemplateApiService" interface="com.gic.haoban.manage.api.service.hm.HmPageTemplateApiService"
+					 timeout="10000" retries="0" check="false" />
+	<dubbo:reference id="hmWelcomeRelationApiService" interface="com.gic.haoban.manage.api.service.hm.HmWelcomeRelationApiService"
+					 timeout="10000" retries="0" check="false" />
 					 
 </beans>