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

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

@@ -16,7 +16,7 @@ public class HmLinkWxaDTO implements Serializable {
 
     private static final long serialVersionUID = 6473795387449522116L;
 
-    private HmPageDTO page;
+    private Long pageId ;
     // 二维码
     private String hmQrcode;
 
@@ -30,6 +30,14 @@ public class HmLinkWxaDTO implements Serializable {
     // 说明
     private String sm ;
 
+    public Long getPageId() {
+        return pageId;
+    }
+
+    public void setPageId(Long pageId) {
+        this.pageId = pageId;
+    }
+
     public String getSm() {
         return sm;
     }
@@ -69,12 +77,4 @@ public class HmLinkWxaDTO implements Serializable {
     public void setSelectStoreFlag(int selectStoreFlag) {
         this.selectStoreFlag = selectStoreFlag;
     }
-
-    public HmPageDTO getPage() {
-        return page;
-    }
-
-    public void setPage(HmPageDTO page) {
-        this.page = page;
-    }
 }
\ No newline at end of file

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

@@ -18,6 +18,7 @@ public class HmQrcodeTempQO implements Serializable {
     private Long id;
     private String wxConfigId;
     private String wxQrcode;
+    private String corpid ;
     private String wxEnterpriseId;
     private java.util.Date createTime;
     private java.util.Date updateTime;
@@ -25,6 +26,14 @@ public class HmQrcodeTempQO implements Serializable {
     private Integer statusFlag;
     private String relationId ;
 
+    public String getCorpid() {
+        return corpid;
+    }
+
+    public void setCorpid(String corpid) {
+        this.corpid = corpid;
+    }
+
     public String getRelationId() {
         return relationId;
     }

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

@@ -91,7 +91,14 @@ public class HmLinkServiceImpl implements HmLinkService {
         }
         return link;
     }
-
+    
+    private void delCache(Long linkId , String shortCode) {
+        String key1 = "hm:link:" + shortCode;
+        RedisUtil.delCache(key1) ;
+        String key2 = "hm:link:" + linkId;
+        RedisUtil.delCache(key2) ;
+    }
+    
     @Override
     public List<HmLinkBO> listForSms(String wxEnterpriseId, String enterpriseId, String linkName, Integer linkType) {
         List<TabHmLink> list = this.linkMapper.listForSms(wxEnterpriseId, enterpriseId, linkName, linkType);
@@ -116,6 +123,7 @@ public class HmLinkServiceImpl implements HmLinkService {
             this.linkMapper.insert(entity);
         } else {
             TabHmLink oldLink = this.linkMapper.selectById(linkId);
+            this.delCache(oldLink.getLinkId(), oldLink.getShortCode());
             oldWelcomeId = oldLink.getWelcomeId();
             TabHmLink entity = EntityUtil.changeEntityByJSON(TabHmLink.class, dto);
             this.linkMapper.update(entity);

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

@@ -30,7 +30,6 @@ 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.hm.HmLinkStoreSettingDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkWxaDTO;
-import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
 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;
@@ -38,7 +37,6 @@ import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMap
 import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
 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.pojo.bo.hm.KeyDataLinkBO;
 import com.gic.haoban.manage.service.pojo.qo.HmQrcodeTempQO;
@@ -47,7 +45,6 @@ import com.gic.haoban.manage.service.service.MemberQueryService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.service.hm.HmLinkService;
 import com.gic.haoban.manage.service.service.hm.HmLinkStoreService;
-import com.gic.haoban.manage.service.service.hm.HmPageService;
 import com.gic.haoban.manage.service.service.hm.HmQrcodeService;
 import com.gic.haoban.manage.service.service.hm.HmQrcodeTempService;
 import com.gic.member.api.dto.MemberClerkDTO;
@@ -86,8 +83,6 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
     @Autowired
     private WxEnterpriseService wxEnterpriseService;
     @Autowired
-    private HmPageService hmPageService;
-    @Autowired
     private HmQrcodeTempService hmQrcodeTempService;
     @Autowired
     private TabHaobanExternalClerkRelatedMapper tabHaobanExternalClerkRelatedMapper;
@@ -345,10 +340,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                 }
             }
             // 查询页面
-            HmPageBO page = this.hmPageService.queryHmPageDetail(link.getPageId());
-            if (null != page) {
-                retDTO.setPage(EntityUtil.changeEntityByJSON(HmPageDTO.class, page));
-            }
+            retDTO.setPageId(link.getPageId());
         }
         // 生成动态活码
         log.info(JSON.toJSONString(retDTO, true));
@@ -403,6 +395,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
             qo.setWxConfigId(wxResp.getConfig_id());
             qo.setWxQrcode(wxResp.getQr_code());
             qo.setRelationId(key);
+            qo.setCorpid(corpid);
             this.hmQrcodeTempService.save(qo);
             return ServiceResponse.success(wxResp.getQr_code());
         }