时间

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/marketing/MemberMarketingController.java

@@ -123,7 +123,7 @@ public class MemberMarketingController extends WebBaseController {
         // 时间默认一个月
         if (beginTime == null || endTime == null) {
             Calendar start = Calendar.getInstance();
-            start.add(Calendar.MONTH, -1);
+            start.add(Calendar.MONTH, -3);
             beginTime = start.getTime();
             endTime = new Date();
         }
@@ -168,7 +168,7 @@ public class MemberMarketingController extends WebBaseController {
         // 时间默认一个月
         if (putBeginTime == null || putEndTime == null) {
             Calendar start = Calendar.getInstance();
-            start.add(Calendar.MONTH, -1);
+            start.add(Calendar.MONTH, -3);
             putBeginTime = start.getTime();
             putEndTime = new Date();
         }
@@ -208,7 +208,7 @@ public class MemberMarketingController extends WebBaseController {
         // 时间默认一个月
         if (beginTime == null || endTime == null) {
             Calendar start = Calendar.getInstance();
-            start.add(Calendar.MONTH, -1);
+            start.add(Calendar.MONTH, -3);
             beginTime = start.getTime();
             endTime = new Date();
         }
@@ -245,7 +245,7 @@ public class MemberMarketingController extends WebBaseController {
         // 时间默认一个月
         if (beginTime == null || endTime == null) {
             Calendar start = Calendar.getInstance();
-            start.add(Calendar.MONTH, -1);
+            start.add(Calendar.MONTH, -3);
             beginTime = start.getTime();
             endTime = new Date();
         }
@@ -262,7 +262,7 @@ public class MemberMarketingController extends WebBaseController {
         // 时间默认一个月
         Calendar start = Calendar.getInstance();
         Date endTime = start.getTime();
-        start.add(Calendar.MONTH, -6);
+        start.add(Calendar.MONTH, -3);
         Date beginTime = start.getTime();
         // ecm
         RestResponse<Object> ecmRep = this.memberEcmLogPage(memberId, "", null, beginTime, endTime, 1, 1, enterpriseId);
@@ -296,11 +296,15 @@ public class MemberMarketingController extends WebBaseController {
     public RestResponse<Object> pageAiMemberMarketingLog(String memberId, String planName, String aiStartTime,
             String aiEndTime, @RequestParam(defaultValue = "1") int currentPage,
             @RequestParam(defaultValue = "20") int pageSize) {
+        Calendar start = Calendar.getInstance();
+        Date endTime = start.getTime();
+        start.add(Calendar.MONTH, -3);
+        Date beginTime = start.getTime();
         PageQo pageQo = new PageQo() ;
         pageQo.setPageNum(currentPage);
         pageQo.setPageSize(pageSize);
         ServiceResponse<Page<AiMemberLogListDTO>> res = aiMemberLogApiService.pageAiMemberMarketingLog(memberId,
-                planName, Lists.newArrayList(0, 1, 6, 8), aiStartTime, aiEndTime, pageQo.getBasePageInfo());
+                planName, Lists.newArrayList(0, 1, 6, 8), DateUtil.dateToStr(beginTime, "yyyy-MM-dd"), DateUtil.dateToStr(endTime, "yyyy-MM-dd"), pageQo.getBasePageInfo());
         if (res.isSuccess()) {
             Page<AiMemberLogListDTO> page = res.getResult();
             List<AiMemberLogListDTO> list = page.getResult();