link

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

@@ -25,19 +25,19 @@ 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.HmPageTemplateRespDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
 import com.gic.haoban.manage.api.service.hm.HmLinkApiService;
-import com.gic.haoban.manage.api.service.hm.HmPageTemplateApiService;
 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.HmPageBO;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmQrcodeBO;
 import com.gic.haoban.manage.service.service.KeyDataService;
 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.member.api.dto.es.MemberDataDTO;
 import com.gic.member.api.dto.es.MemberStoreClerkDataDTO;
@@ -72,7 +72,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
     @Autowired
     private WxEnterpriseService wxEnterpriseService;
     @Autowired
-    private HmPageTemplateApiService hmPageTemplateApiService;
+    private HmPageService hmPageService;
 
     @Override
     public ServiceResponse<HmLinkDTO> getByLinkId(String wxEnterpriseId, String enterpriseId, Long linkId) {
@@ -109,12 +109,12 @@ 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) ;
-        if(null == link) {
+        TabHmLink link = this.hmLinkService.getByLinkShortCode(enterpriseId, linkShortCode);
+        if (null == link) {
             log.error("链接记录不存,linkShortCode={}", linkShortCode);
             return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "链接记录不存");
         }
-        Long linkId = link.getLinkId() ;
+        Long linkId = link.getLinkId();
         String wxEnterpriseId = link.getWxEnterpriseId();
         WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
         if (wxEnterpriseDTO == null) {
@@ -258,7 +258,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                 this.addQrcode(hm, key, wxEnterpriseDTO.getCorpid(), retDTO);
             }
             // 查询页面
-            ServiceResponse<HmPageTemplateRespDTO> resp = this.hmPageTemplateApiService.queryPageTemplateDetail(link.getPageId());
+            HmPageBO page = this.hmPageService.queryHmPageDetail(link.getPageId());
             // retDTO.setPage(resp.getResult());
         }
         // 生成动态活码
@@ -315,6 +315,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         }
         return hm;
     }
+
     // 冗余会员信息
     private MemberDataDTO getMemberClerk(String enterpriseId, String memberId) {
         String returnFields = "memberId,mainClerkId,mainStoreId,storeClerkRel";