Merge remote-tracking branch 'origin/developer' into developer

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

@@ -37,7 +37,7 @@ public interface HmLinkApiService {
 
     public ServiceResponse<Page<HmLinkDTO>> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo);
 
-    public ServiceResponse<HmLinkDTO> save(HmLinkDTO dto);
+    public ServiceResponse<String> save(HmLinkDTO dto);
 
     /**
      * 

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

@@ -8,6 +8,8 @@ public enum HaoBanErrCode {
     ERR_0001("10100001", "参数没有传"),
     ERR_10012("10012","企业微信不存在"),
     ERR_OTHER("9999","业务异常"),
+
+    ERR_100033("100033", "活码分组已经被关联,不可删除")
     ;
 
     private String code;

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

+package com.gic.haoban.manage.service.pojo.bo.hm;
+
+import java.io.Serializable;
+
+/**
+ * 
+ * @ClassName: TabHaobanHmLink
+ * @Description: TODO
+ * @Author 徐高华
+ * @Date 2022年07月01日 14:07:23
+ * @Modify
+ * @CopyRight 
+ */
+public class HmLinkBO implements Serializable {
+
+    private static final long serialVersionUID = 1967119533845800L;
+
+    private Long linkId;
+    private String shortCode ;
+    private String linkCode;
+    /**1通用链接 2专用链接*/
+    private Integer linkType;
+    private String wxEnterpriseId;
+    private String enterpriseId;
+    private String name;
+    private String remark;
+    private String welcomeId;
+    private Long pageId;
+    private String creatorId;
+    private String creatorName;
+    private String modifierId;
+    private String modifierName;
+    private java.util.Date createTime;
+    private java.util.Date updateTime;
+    /**会员门店规则*/
+    private String storeRuleJson;
+    /**推荐门店规则*/
+    private String customRuleJson;
+    /**会员活动标签*/
+    private String memberLabelId;
+    /**0删除 1正常*/
+    private Integer statusFlag;
+
+    public String getShortCode() {
+        return shortCode;
+    }
+
+    public void setShortCode(String shortCode) {
+        this.shortCode = shortCode;
+    }
+
+    public void setLinkId(Long linkId) {
+        this.linkId = linkId;
+    }
+
+    public Long getLinkId() {
+        return linkId;
+    }
+
+    public void setLinkCode(String linkCode) {
+        this.linkCode = linkCode;
+    }
+
+    public String getLinkCode() {
+        return linkCode;
+    }
+
+    public void setLinkType(Integer linkType) {
+        this.linkType = linkType;
+    }
+
+    public Integer getLinkType() {
+        return linkType;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setWelcomeId(String welcomeId) {
+        this.welcomeId = welcomeId;
+    }
+
+    public String getWelcomeId() {
+        return welcomeId;
+    }
+
+    public void setPageId(Long pageId) {
+        this.pageId = pageId;
+    }
+
+    public Long getPageId() {
+        return pageId;
+    }
+
+    public void setCreatorId(String creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    public String getCreatorId() {
+        return creatorId;
+    }
+
+    public void setCreatorName(String creatorName) {
+        this.creatorName = creatorName;
+    }
+
+    public String getCreatorName() {
+        return creatorName;
+    }
+
+    public void setModifierId(String modifierId) {
+        this.modifierId = modifierId;
+    }
+
+    public String getModifierId() {
+        return modifierId;
+    }
+
+    public void setModifierName(String modifierName) {
+        this.modifierName = modifierName;
+    }
+
+    public String getModifierName() {
+        return modifierName;
+    }
+
+    public void setCreateTime(java.util.Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public java.util.Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setUpdateTime(java.util.Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public java.util.Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setStoreRuleJson(String storeRuleJson) {
+        this.storeRuleJson = storeRuleJson;
+    }
+
+    public String getStoreRuleJson() {
+        return storeRuleJson;
+    }
+
+    public void setCustomRuleJson(String customRuleJson) {
+        this.customRuleJson = customRuleJson;
+    }
+
+    public String getCustomRuleJson() {
+        return customRuleJson;
+    }
+
+    public void setMemberLabelId(String memberLabelId) {
+        this.memberLabelId = memberLabelId;
+    }
+
+    public String getMemberLabelId() {
+        return memberLabelId;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+}
\ No newline at end of file

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

@@ -7,20 +7,20 @@ import com.gic.api.base.commons.Page;
 import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkStoreDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
-import com.gic.haoban.manage.service.entity.hm.TabHmLink;
+import com.gic.haoban.manage.service.pojo.bo.hm.HmLinkBO;
 
 public interface HmLinkService {
 
-    public TabHmLink getByLinkId(String wxEnterpriseId, String enterprieId,Long linkId);
+    public HmLinkBO getByLinkId(String wxEnterpriseId, String enterprieId,Long linkId);
     
-    public TabHmLink getByLinkShortCode(String enterprieId,String shortCode);
+    public HmLinkBO getByLinkShortCode(String enterprieId,String shortCode);
     
-    public TabHmLink getByLinkIdFormCache(String wxEnterpriseId, String enterprieId,Long linkId);
+    public HmLinkBO getByLinkIdFormCache(String wxEnterpriseId, String enterprieId,Long linkId);
 
-    public List<HmLinkDTO> listForSms(String wxEnterpriseId, String enterprieId, String linkName, Integer linkType);
+    public List<HmLinkBO> listForSms(String wxEnterpriseId, String enterprieId, String linkName, Integer linkType);
 
-    public HmLinkDTO saveLink(HmLinkDTO dto, List<HmLinkStoreDTO> stoerList);
+    public String saveLink(HmLinkDTO dto, List<HmLinkStoreDTO> stoerList);
 
-    public Page<HmLinkDTO> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo);
+    public Page<HmLinkBO> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo);
 
 }

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

@@ -20,6 +20,7 @@ import com.gic.haoban.manage.api.dto.hm.HmLinkStoreDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
 import com.gic.haoban.manage.service.dao.mapper.hm.HmLinkMapper;
 import com.gic.haoban.manage.service.entity.hm.TabHmLink;
+import com.gic.haoban.manage.service.pojo.bo.hm.HmLinkBO;
 import com.gic.haoban.manage.service.service.hm.HmLinkService;
 import com.gic.haoban.manage.service.service.hm.HmLinkStoreService;
 import com.gic.redis.data.util.RedisUtil;
@@ -41,21 +42,29 @@ public class HmLinkServiceImpl implements HmLinkService {
     private HmLinkStoreService hmLinkStoreService;
 
     @Override
-    public TabHmLink getByLinkId(String wxEnterpriseId, String enterprieId, Long linkId) {
+    public HmLinkBO getByLinkId(String wxEnterpriseId, String enterprieId, Long linkId) {
         TabHmLink link = this.linkMapper.selectById(linkId);
-        return link;
+        if(null == link) {
+            return null ;
+        }
+        HmLinkBO bo = EntityUtil.changeEntityByJSON(HmLinkBO.class, link);
+        return bo;
     }
     
     @Override
-    public TabHmLink getByLinkShortCode(String enterpriseId, String shortCode) {
+    public HmLinkBO getByLinkShortCode(String enterpriseId, String shortCode) {
         TabHmLink link = this.linkMapper.selectByShortCode(enterpriseId, shortCode);
-        return link;
+        if(null == link) {
+            return null ;
+        }
+        HmLinkBO bo = EntityUtil.changeEntityByJSON(HmLinkBO.class, link);
+        return bo;
     }
 
     @Override
-    public TabHmLink getByLinkIdFormCache(String wxEnterpriseId, String enterprieId, Long linkId) {
+    public HmLinkBO getByLinkIdFormCache(String wxEnterpriseId, String enterprieId, Long linkId) {
         String key = "hm:link:" + linkId;
-        TabHmLink link = RedisUtil.getCache(key, TabHmLink.class);
+        HmLinkBO link = RedisUtil.getCache(key, HmLinkBO.class);
         if (link == null) {
             link = this.getByLinkId(wxEnterpriseId, enterprieId, linkId);
             if (link != null) {
@@ -66,14 +75,14 @@ public class HmLinkServiceImpl implements HmLinkService {
     }
 
     @Override
-    public List<HmLinkDTO> listForSms(String wxEnterpriseId, String enterpriseId, String linkName, Integer linkType) {
+    public List<HmLinkBO> listForSms(String wxEnterpriseId, String enterpriseId, String linkName, Integer linkType) {
         List<TabHmLink> list = this.linkMapper.listForSms(wxEnterpriseId, enterpriseId, linkName, linkType);
-        return EntityUtil.changeEntityListByJSON(HmLinkDTO.class, list);
+        return EntityUtil.changeEntityListByJSON(HmLinkBO.class, list);
     }
 
     @Override
     @Transactional
-    public HmLinkDTO saveLink(HmLinkDTO dto, List<HmLinkStoreDTO> storeList) {
+    public String saveLink(HmLinkDTO dto, List<HmLinkStoreDTO> storeList) {
         // 新增
         Long linkId = dto.getLinkId();
         if (null == linkId) {
@@ -91,11 +100,11 @@ public class HmLinkServiceImpl implements HmLinkService {
             this.linkMapper.update(entity);
         }
         this.hmLinkStoreService.saveStore(linkId, storeList);
-        return dto;
+        return dto.getLinkCode();
     }
 
     @Override
-    public Page<HmLinkDTO> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo) {
+    public Page<HmLinkBO> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo) {
         PageHelper.startPage(basePageInfo);
         String wxEnterpriseId = qdto.getWxEnterpriseId();
         String enterpriseId = qdto.getEnterpriseId();
@@ -104,8 +113,8 @@ public class HmLinkServiceImpl implements HmLinkService {
         Integer linkType = qdto.getLinkType();
         List<TabHmLink> list = this.linkMapper.list(wxEnterpriseId, enterpriseId, startDate, endDate, linkType,
                 qdto.getSearchParams());
-        Page<HmLinkDTO> page = PageHelperUtils.changePageHelperToCurrentPage(list, HmLinkDTO.class);
-        return page;
+        Page<HmLinkBO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, HmLinkBO.class);
+        return retPage;
     }
 
     public String shortCode(String enterpriseId) {

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

@@ -14,8 +14,8 @@ import org.springframework.stereotype.Service;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogQDTO;
 import com.gic.haoban.manage.service.dao.mapper.hm.WxUserAddLogMapper;
-import com.gic.haoban.manage.service.entity.hm.TabHmLink;
 import com.gic.haoban.manage.service.entity.hm.TabWxUserAddLog;
+import com.gic.haoban.manage.service.pojo.bo.hm.HmLinkBO;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmQrcodeBO;
 import com.gic.haoban.manage.service.service.MemberQueryService;
 import com.gic.haoban.manage.service.service.hm.HmLinkService;
@@ -77,7 +77,7 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
                 memberLabelId = hm.getMemberLabelId();
             }
             if (null != qdto.getLinkId()) {
-                TabHmLink link = this.hmLinkService.getByLinkIdFormCache(qdto.getWxEnterpriseId(),
+                HmLinkBO link = this.hmLinkService.getByLinkIdFormCache(qdto.getWxEnterpriseId(),
                         qdto.getEnterpriseId(), qdto.getLinkId());
                 entity.setAddChannel(1);
                 entity.setLinkId(qdto.getLinkId());

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

@@ -9,6 +9,7 @@ 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.errorcode.HaoBanErrCode;
 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;
@@ -43,11 +44,12 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
 
     @Override
     public ServiceResponse<Long> saveOrUpdateHmGroupSetting(HmGroupDTO hmGroupDTO) {
+        log.info("[saveOrUpdateHmGroupSetting] params:{}", JSON.toJSONString(hmGroupDTO));
         if (StringUtils.isBlank(hmGroupDTO.getGroupName())) {
             return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_5.getCode() + "", HaoBanErrCodeCommon.ERR_5.getMsg());
         }
         if (StringUtils.equals(DEFAULT_GROUP_NAME, hmGroupDTO.getGroupName())) {
-            return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_5.getCode() + "", HaoBanErrCodeCommon.ERR_5.getMsg());
+            return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_9.getCode() + "", HaoBanErrCodeCommon.ERR_9.getMsg());
         }
         HmGroupInfoQO groupInfoQo = new HmGroupInfoQO();
         groupInfoQo.setGroupName(hmGroupDTO.getGroupName());
@@ -97,7 +99,7 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
         Page<HmGroupDTO> groupDtoPage = PageUtil.changeToCurrentPage(groupSettingPage, HmGroupDTO.class);
         List<HmGroupDTO> result = new ArrayList<>();
         // todo query 活码 默认分组的总数
-        result.add(buildDefault(null));
+        result.add(buildDefault(0));
         if (CollectionUtils.isNotEmpty(groupDtoPage.getResult())) {
             groupDtoPage.getResult().forEach(item -> item.setDefaultFlag(0));
             result.addAll(groupDtoPage.getResult());
@@ -126,9 +128,11 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
         }
         HmGroupSettingBO groupSettingBo = groupService.queryGroupSettingDetail(groupDTO.getGroupId());
         if (groupSettingBo == null
-                || !HmGroupStatus.ENABLE.getCode().equals(groupSettingBo.getStatus())
-                || groupSettingBo.getReferNum() != 0) {
-            return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_5.getCode() + "", HaoBanErrCodeCommon.ERR_5.getMsg());
+                || !HmGroupStatus.ENABLE.getCode().equals(groupSettingBo.getStatus())){
+            return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_8.getCode() + "", HaoBanErrCodeCommon.ERR_8.getMsg());
+        }
+        if (groupSettingBo.getReferNum() != null && groupSettingBo.getReferNum() > 0){
+            return ServiceResponse.failure(HaoBanErrCode.ERR_100033.getCode(), HaoBanErrCode.ERR_100033.getMsg());
         }
         groupService.deleteGroupSetting(groupDTO);
         return ServiceResponse.success(Boolean.TRUE);

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

@@ -20,6 +20,7 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.PageHelperUtils;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkStoreDTO;
@@ -28,8 +29,8 @@ import com.gic.haoban.manage.api.dto.hm.HmLinkWxaDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
 import com.gic.haoban.manage.api.service.hm.HmLinkApiService;
 import com.gic.haoban.manage.service.config.Config;
-import com.gic.haoban.manage.service.entity.hm.TabHmLink;
 import com.gic.haoban.manage.service.errorcode.HaoBanErrCode;
+import com.gic.haoban.manage.service.pojo.bo.hm.HmLinkBO;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmPageBO;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmQrcodeBO;
 import com.gic.haoban.manage.service.service.KeyDataService;
@@ -76,7 +77,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
 
     @Override
     public ServiceResponse<HmLinkDTO> getByLinkId(String wxEnterpriseId, String enterpriseId, Long linkId) {
-        TabHmLink link = this.hmLinkService.getByLinkId(wxEnterpriseId, enterpriseId, linkId);
+        HmLinkBO link = this.hmLinkService.getByLinkId(wxEnterpriseId, enterpriseId, linkId);
         if (null != link) {
             HmLinkDTO dto = EntityUtil.changeEntityByJSON(HmLinkDTO.class, link);
             List<HmLinkStoreDTO> storeList = this.hmLinkStoreService.listByLinkId(dto.getWxEnterpriseId(),
@@ -90,17 +91,22 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
     @Override
     public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName,
             Integer linkType) {
-        return ServiceResponse.success(this.hmLinkService.listForSms(wxEnterpriseId, enterprieId, linkName, linkType));
+        List<HmLinkBO> list = this.hmLinkService.listForSms(wxEnterpriseId, enterprieId, linkName, linkType) ;
+        List<HmLinkDTO> retList = EntityUtil.changeEntityListByJSON(HmLinkDTO.class, list) ;
+        return ServiceResponse.success(retList);
     }
 
     @Override
-    public ServiceResponse<HmLinkDTO> save(HmLinkDTO dto) {
-        return ServiceResponse.success(this.hmLinkService.saveLink(dto, dto.getStoreList()));
+    public ServiceResponse<String> save(HmLinkDTO dto) {
+        String id = this.hmLinkService.saveLink(dto, dto.getStoreList()) ;
+        return ServiceResponse.success(id);
     }
 
     @Override
     public ServiceResponse<Page<HmLinkDTO>> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo) {
-        return ServiceResponse.success(this.hmLinkService.listPage(qdto, basePageInfo));
+        Page<HmLinkBO> page = this.hmLinkService.listPage(qdto, basePageInfo) ;
+        Page<HmLinkDTO> resultPage = PageHelperUtils.changePageToCurrentPage(page, HmLinkDTO.class);
+        return ServiceResponse.success(resultPage);
     }
 
     @Override
@@ -109,7 +115,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         HmQrcodeBO hm = null;
         HmLinkWxaDTO retDTO = new HmLinkWxaDTO();
         log.info("小程序获取活码={},linkShortCode={},mixPhone={}", enterpriseId, linkShortCode, mixPhone);
-        TabHmLink link = this.hmLinkService.getByLinkShortCode(enterpriseId, linkShortCode);
+        HmLinkBO link = this.hmLinkService.getByLinkShortCode(enterpriseId, linkShortCode);
         if (null == link) {
             log.error("链接记录不存,linkShortCode={}", linkShortCode);
             return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "链接记录不存");

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

@@ -47,7 +47,7 @@ public class HmGroupController extends WebBaseController {
         if (serviceResponse.isSuccess()){
             return RestResponse.successResult(serviceResponse.getResult());
         }
-        return RestResponse.failure(serviceResponse.getCode()+"", serviceResponse.getMessage());
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
     }
 
     @RequestMapping(path = "/list")
@@ -80,7 +80,7 @@ public class HmGroupController extends WebBaseController {
         if (serviceResponse.isSuccess()){
             return RestResponse.successResult(serviceResponse.getResult());
         }
-        return RestResponse.failure(serviceResponse.getCode()+"", serviceResponse.getMessage());
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
     }
 
     @RequestMapping(path = "/delete", method = RequestMethod.POST)
@@ -97,7 +97,7 @@ public class HmGroupController extends WebBaseController {
         if (serviceResponse.isSuccess()){
             return RestResponse.successResult(serviceResponse.getResult());
         }
-        return RestResponse.failure(serviceResponse.getCode()+"", serviceResponse.getMessage());
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
     }
 
     @RequestMapping(path = "/refer/count")

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

@@ -29,6 +29,7 @@ import com.gic.haoban.manage.api.service.hm.HmLinkApiService;
 import com.gic.haoban.manage.api.service.hm.HmPageApiService;
 import com.gic.haoban.manage.api.service.out.WelcomeApiService;
 import com.gic.haoban.manage.web.vo.hm.HmLinkListVO;
+import com.gic.haoban.manage.web.vo.hm.HmLinkVO;
 import com.gic.member.tag.api.dto.MemberTagItemDTO;
 import com.gic.member.tag.api.service.MemberTagApiService;
 
@@ -62,9 +63,9 @@ public class HmLinkController {
         dto.setModifierName(loginUser.getClerkName());
         dto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         dto.setEnterpriseId(loginUser.getEnterpriseId());
-        ServiceResponse<HmLinkDTO> resp = this.hmLinkApiService.save(dto);
+        ServiceResponse<String> resp = this.hmLinkApiService.save(dto);
         if (resp.isSuccess()) {
-            String logContent = "新增引流链接【" + resp.getResult().getLinkCode() + "-" + dto.getName() + "】";
+            String logContent = "新增引流链接【" + resp.getResult() + "-" + dto.getName() + "】";
         }
         return RestResponse.successResult();
     }
@@ -357,9 +358,9 @@ public class HmLinkController {
         qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         qdto.setEnterpriseId(loginUser.getEnterpriseId());
         ServiceResponse<Page<HmLinkDTO>> resp = this.hmLinkApiService.listPage(qdto, basePageInfo);
-        Page<HmLinkDTO> page = resp.getResult() ;
-        Page<HmLinkListVO> retPage = EntityUtil.changeEntityByJSON(Page.class, page) ;
-        List<HmLinkListVO> list = EntityUtil.changeEntityListByJSON(HmLinkListVO.class, page.getResult()) ;
+        Page<HmLinkDTO> page = resp.getResult();
+        Page<HmLinkListVO> retPage = EntityUtil.changeEntityByJSON(Page.class, page);
+        List<HmLinkListVO> list = EntityUtil.changeEntityListByJSON(HmLinkListVO.class, page.getResult());
         retPage.setResult(list);
         return RestResponse.successResult(retPage);
     }
@@ -375,7 +376,8 @@ public class HmLinkController {
         }
         HmLinkDTO link = linkResp.getResult();
         Map<String, Object> retMap = new HashMap<>();
-        retMap.put("link", link);
+        HmLinkVO linkVO = EntityUtil.changeEntityByJSON(HmLinkVO.class, link);
+        retMap.put("link", linkVO);
         // 落地页
         Long pageId = link.getPageId();
         if (null != pageId) {

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

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -38,7 +39,7 @@ public class HmPageController {
     private HmPageApiService pageApiService;
 
     @RequestMapping(path = "/page/save")
-    public RestResponse<?> savePage(HmPageSettingReq pageSettingVO){
+    public RestResponse<?> savePage(@Valid HmPageSettingReq pageSettingVO){
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         HmPageDTO pageDTO = new HmPageDTO();
         pageDTO.setPageName(pageSettingVO.getTemplateName());
@@ -63,7 +64,7 @@ public class HmPageController {
 
 
     @RequestMapping(path = "/page/edit")
-    public RestResponse<?> editPageTemplate(HmPageSettingReq pageSettingVO){
+    public RestResponse<?> editPageTemplate(@Valid HmPageSettingReq pageSettingVO){
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         HmPageDTO pageDTO = new HmPageDTO();
         pageDTO.setPageId(pageSettingVO.getTemplateId());

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -124,7 +124,14 @@ public enum HaoBanErrCode {
     ERR_100032(100032, "代理不能设置导购编辑权限"),
     ERR_100007(100007, "无门店权限"),
     ERR_DEFINE(-888, "自定义错误"),
-    ERR_OTHER(-999, "未知错误code");
+    ERR_OTHER(-999, "未知错误code"),
+
+    /**
+     * 活码相关
+     *
+     */
+    ERR_100033(100033, "分组被关联，不可删除"),
+    ;
     private int code;
     private String msg;
 

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.Length;
 import org.hibernate.validator.constraints.NotEmpty;
 
 import java.io.Serializable;
@@ -12,7 +13,9 @@ import java.io.Serializable;
  **/
 public class HmGroupSettingVO implements Serializable {
 
+    private static final long serialVersionUID = -371589430652512397L;
     @NotEmpty(message = "活码分组名字不能为空")
+    @Length(max = 10, message = "分组名称最多10个字符")
     private String groupName;
 
     private Long groupId;

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

+package com.gic.haoban.manage.web.vo.hm;
+
+import java.io.Serializable;
+
+/**
+ * 
+ * @ClassName: TabHaobanHmLinkStore
+ * @Description: TODO
+ * @Author 徐高华
+ * @Date 2022年07月04日 11:19:29
+ * @Modify
+ * @CopyRight 
+ */
+public class HmLinkStoreVO implements Serializable {
+
+    private static final long serialVersionUID = 2215892411689400L;
+
+    private String storeId;
+    private String storeCode;
+    private String storeName;
+    private String storeAddress;
+
+    public String getStoreAddress() {
+        return storeAddress;
+    }
+
+    public void setStoreAddress(String storeAddress) {
+        this.storeAddress = storeAddress;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+}
\ No newline at end of file

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

 package com.gic.haoban.manage.web.vo.hm;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 
@@ -42,6 +43,15 @@ public class HmLinkVO implements Serializable {
     /**0删除 1正常*/
     private Integer statusFlag;
     private String shortCode;
+    private List<HmLinkStoreVO> storeList;
+    
+    public List<HmLinkStoreVO> getStoreList() {
+        return storeList;
+    }
+
+    public void setStoreList(List<HmLinkStoreVO> storeList) {
+        this.storeList = storeList;
+    }
 
     public Long getLinkId() {
         return linkId;

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

 package com.gic.haoban.manage.web.vo.hm;
 
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.NotEmpty;
+
 import java.io.Serializable;
 
 /**
@@ -15,15 +18,19 @@ public class HmPageSettingReq implements Serializable {
     /**
      * 落地页模板名称
      */
+    @NotEmpty(message = "落地页模板名称不能为空")
+    @Length(max = 20, message = "落地页模板名称长度最大为20个字符")
     private String templateName;
     /**
      * 页面标题
      */
+    @Length(max = 10, message = "落地页页面标题长度最大为10个字符")
     private String pageTitle;
 
     /**
      * 商户名称
      */
+    @Length(max = 20, message = "落地页模板商户名称长度最大为20个字符")
     private String merchantName;
 
     /**