Merge branch 'master_xgh_我的客户迭代' into 'developer'

Master xgh 我的客户迭代

See merge request !382

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

 package com.gic.haoban.manage.api.dto;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * desc：员工导购id与导购wxUserId实体
@@ -23,13 +24,24 @@ public class ClerkStaffWxUserDTO implements Serializable {
      */
     private String staffClerkId;
     
+    private Date addFriendTime ;
+
+    public Date getAddFriendTime() {
+        return addFriendTime;
+    }
+
+    public void setAddFriendTime(Date addFriendTime) {
+        this.addFriendTime = addFriendTime;
+    }
+
     public ClerkStaffWxUserDTO() {
     }
 
-    public ClerkStaffWxUserDTO(String staffId, String staffClerkId, String memberExternalUserId) {
+    public ClerkStaffWxUserDTO(String staffId, String staffClerkId, String memberExternalUserId , Date addFriendTime) {
         this.memberExternalUserId = memberExternalUserId;
         this.staffId = staffId;
         this.staffClerkId = staffClerkId;
+        this.addFriendTime = addFriendTime ;
     }
 
     public String getMemberExternalUserId() {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/ext/MemberStaffRelExtDO.java

 package com.gic.haoban.manage.service.entity.ext;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * desc：会员导购关系扩展实体类
@@ -24,6 +25,16 @@ public class MemberStaffRelExtDO implements Serializable {
      */
     private String staffClerkId;
     
+    private Date addFriendTime ;
+
+    public Date getAddFriendTime() {
+        return addFriendTime;
+    }
+
+    public void setAddFriendTime(Date addFriendTime) {
+        this.addFriendTime = addFriendTime;
+    }
+
     public String getMemberId() {
         return memberId;
     }

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

@@ -491,7 +491,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
                 // key-memberId
                 MemberStaffRelExtDO::getMemberId,
                 // value-list
-                e -> new ArrayList<>(Collections.singletonList(new ClerkStaffWxUserDTO(e.getStaffId(), e.getStaffClerkId(), e.getMemberExternalUserId()))),
+                e -> new ArrayList<>(Collections.singletonList(new ClerkStaffWxUserDTO(e.getStaffId(), e.getStaffClerkId(), e.getMemberExternalUserId(),e.getAddFriendTime()))),
                 // 重复key的value添加到集合
                 (List<ClerkStaffWxUserDTO> oldList, List<ClerkStaffWxUserDTO> newList) -> {
                     oldList.addAll(newList);

haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

@@ -352,6 +352,7 @@
         select * from (
         select ecr.member_id as memberId,
         ecr.external_user_id as memberExternalUserId,
+        ecr.create_time as addFriendTime ,
         scr.staff_id as staffId,
         scr.clerk_id as staffClerkId
         from tab_haoban_external_clerk_related as ecr
@@ -373,7 +374,7 @@
         <foreach collection="memberIdList" item="item" separator="," open="(" close=")">
             #{item}
         </foreach>
-        ) t where t.staffId is not null
+        ) t where t.staffId is not null ORDER BY t.addFriendTime DESC 
     </select>
 
 

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();