log

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

@@ -26,10 +26,14 @@ import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkStoreSettingDTO;
 import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
+import com.gic.haoban.manage.api.dto.hm.WxUserAddLogDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
+import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogQDTO;
+import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogSearchQDTO;
 import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO;
 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.hm.WxUserAddLogApiService;
 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.HmLinkStatisticsClerkVO;
@@ -66,6 +70,8 @@ public class HmLinkController {
     private WelcomeApiService welcomeApiService;
     @Autowired
     private MemberTagApiService memberTagApiService;
+    @Autowired
+    private WxUserAddLogApiService wxUserAddLogApiService;
 
     @RequestMapping("add")
     @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.RECHAGE_CENTER, optType = GicLogRecordOptTypeEnum.RECHAGE_MODIFY_OPT, userFunc = LogRecordUserService.class, optPage = "活码")
@@ -428,9 +434,9 @@ public class HmLinkController {
         Page<HmLinkDTO> page = resp.getResult();
         Page<HmLinkListVO> retPage = EntityUtil.changeEntityByJSON(Page.class, page);
         List<HmLinkListVO> list = EntityUtil.changeEntityListByJSON(HmLinkListVO.class, page.getResult());
-        ServiceResponse<String> urlResp = this.hmLinkApiService.getHmLinkUrl() ;
-        list.forEach(item->{
-            item.setLinkUrl(urlResp.getResult()+item.getShortCode());
+        ServiceResponse<String> urlResp = this.hmLinkApiService.getHmLinkUrl();
+        list.forEach(item -> {
+            item.setLinkUrl(urlResp.getResult() + item.getShortCode());
         });
         retPage.setResult(list);
         return RestResponse.successResult(retPage);
@@ -455,8 +461,8 @@ public class HmLinkController {
                 linkVO.setMemberLabelName(tag.getTagName() + "-" + tag.getTagItemName());
             }
         }
-        ServiceResponse<String> urlResp = this.hmLinkApiService.getHmLinkUrl() ;
-        linkVO.setLinkUrl(urlResp.getResult()+linkVO.getShortCode());
+        ServiceResponse<String> urlResp = this.hmLinkApiService.getHmLinkUrl();
+        linkVO.setLinkUrl(urlResp.getResult() + linkVO.getShortCode());
         retMap.put("link", linkVO);
         // 落地页
         Long pageId = link.getPageId();
@@ -492,7 +498,7 @@ public class HmLinkController {
 
     @RequestMapping("statistics/clerk")
     public RestResponse<Object> statisticsClerk(Long linkId, String storeSearchParams, String clerkSearchParams,
-            Date startTime, Date endTime,BasePageInfo basePageInfo) {
+            Date startTime, Date endTime, BasePageInfo basePageInfo) {
         List<HmLinkStatisticsClerkVO> list = new ArrayList<>();
         list.add(new HmLinkStatisticsClerkVO());
         Page<HmLinkStatisticsClerkVO> page = new Page<>();
@@ -507,7 +513,9 @@ public class HmLinkController {
         list.add(new WxUserAddLogVO());
         Page<WxUserAddLogVO> page = new Page<>();
         page.setResult(list);
-        return RestResponse.successResult(page);
+        WxUserAddLogSearchQDTO qdto = new WxUserAddLogSearchQDTO();
+        ServiceResponse<Page<WxUserAddLogDTO>>  pageResp =  this.wxUserAddLogApiService.page(qdto, basePageInfo);
+        return RestResponse.successResult(pageResp.getResult());
     }
 
 }