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

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

@@ -17,6 +17,7 @@ public class HmLinkWxaDTO implements Serializable {
     private static final long serialVersionUID = 6473795387449522116L;
 
     private Long pageId ;
+    private HmPageDTO page;
     // 二维码
     private String hmQrcode;
 
@@ -29,6 +30,14 @@ public class HmLinkWxaDTO implements Serializable {
     private List<HmLinkStoreDTO> storeList;
     // 说明
     private String sm ;
+    
+    public HmPageDTO getPage() {
+        return page;
+    }
+
+    public void setPage(HmPageDTO page) {
+        this.page = page;
+    }
 
     public Long getPageId() {
         return pageId;

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

@@ -30,6 +30,7 @@ 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;
@@ -37,6 +38,7 @@ 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;
@@ -45,6 +47,7 @@ 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;
@@ -88,6 +91,8 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
     private TabHaobanExternalClerkRelatedMapper tabHaobanExternalClerkRelatedMapper;
     @Autowired
     private MemberClerkApiService memberClerkApiService;
+    @Autowired
+    private HmPageService hmPageService ;
 
     @Override
     public ServiceResponse<String> getHmLinkUrl() {
@@ -153,6 +158,13 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
             log.error("链接记录不存,linkShortCode={}", linkShortCode);
             return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "链接记录不存");
         }
+        // 查询页面
+        retDTO.setPageId(link.getPageId());
+        // 查询页面
+        HmPageBO page = this.hmPageService.queryHmPageDetail(link.getPageId());
+        if (null != page) {
+            retDTO.setPage(EntityUtil.changeEntityByJSON(HmPageDTO.class, page));
+        }
         Long linkId = link.getLinkId();
         String wxEnterpriseId = link.getWxEnterpriseId();
         WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
@@ -337,13 +349,11 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                         retDTO.setSm("创建动态活码失败,取单人活码");
                         retDTO.setHmQrcode(hm.getWxQrcode());
                     } else {
-                        retDTO.setSm("动态活码");
+                        // retDTO.setSm("动态活码");
                         retDTO.setHmQrcode(addResp.getResult());
                     }
                 }
             }
-            // 查询页面
-            retDTO.setPageId(link.getPageId());
         }
         // 生成动态活码
         log.info(JSON.toJSONString(retDTO, true));