销售线索创建时间

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/content/InteractRecordInfoDTO.java

@@ -49,6 +49,11 @@ public class InteractRecordInfoDTO implements Serializable {
     private Date createTime;
 
     /**
+     * 真正的创建时间 createTime可能会变成最新更新时间）
+     */
+    private Date recordCreateTime;
+
+    /**
      * 线索来源 1朋友圈; 2客户群; 3 对话框; 0其他
      */
     private Integer channelSource;
@@ -164,6 +169,14 @@ public class InteractRecordInfoDTO implements Serializable {
         this.createTime = createTime;
     }
 
+    public Date getRecordCreateTime() {
+        return recordCreateTime;
+    }
+
+    public void setRecordCreateTime(Date recordCreateTime) {
+        this.recordCreateTime = recordCreateTime;
+    }
+
     public Integer getEventType() {
         return eventType;
     }

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

@@ -152,6 +152,7 @@ public class InteractRecordApiServiceImpl implements InteractRecordApiService {
         if (item.getLastAccessTime() != null) {
             temp.setCreateTime(item.getLastAccessTime());
         }
+        temp.setRecordCreateTime(item.getCreateTime());
         temp.setInteractRecordId(item.getId());
         if (item.getExtendInfo() != null) {
             InteractRecordExtendInfoDTO extendInfo = new InteractRecordExtendInfoDTO();

haoban-manage3-service/src/test/java/InteractRecordTest.java

@@ -24,6 +24,7 @@ import com.gic.haoban.manage.service.pojo.bo.content.message.InteractRecordMessa
 import com.gic.haoban.manage.service.pojo.qo.content.InteractRecordQO;
 import com.gic.haoban.manage.service.service.content.InteractRecordService;
 import com.gic.haoban.manage.service.service.content.message.InteractRecordMessageService;
+import com.gic.order.api.dto.OrderDTO;
 import com.gic.order.api.dto.req.AllChannelOrderSearchReq;
 import com.gic.order.api.dto.req.MemberOrderOptional;
 import com.gic.order.api.dto.req.OrderFindQDTO;
@@ -66,6 +67,8 @@ public class InteractRecordTest {
     private OrderInfoOutApiService orderInfoOutApiService;
     @Autowired
     private EcommerceOrderOutputApiService ecommerceOrderOutputApiService;
+    @Autowired
+    private MemberOrderReadApiService memberOrderReadApiService;
 
     @Test
     public void test2222() {
@@ -139,6 +142,7 @@ public class InteractRecordTest {
     public void fixOrderChannelCode() throws Exception{
         ExecutorService executorService = Executors.newFixedThreadPool(10);
         InteractRecordQO interactRecordQO = new InteractRecordQO();
+        interactRecordQO.setEnterpriseId("ff8080817af2def7017b146da4d212c4");
         interactRecordQO.setPageNum(1);
         interactRecordQO.setPageSize(100000);
         interactRecordQO.setStartTime(new Date("2020/01/01"));
@@ -169,7 +173,14 @@ public class InteractRecordTest {
                         if (eorderDTO == null) {
                             eorderDTO = ecommerceOrderOutputApiService.getEorderByMemberIdAndOrderNumber(memberId, PlatformChannelEnum.C_BRAND_MALL.getOrderChannelCodeOld(),orderNumber,enterpriseId);
                         }
-                        if (eorderDTO != null) {
+                        if (eorderDTO == null) {
+                            ServiceResponse<OrderDTO> ipos = memberOrderReadApiService.queryByChannelOrderId(enterpriseId, memberId, "weimob", orderNumber);
+                            OrderDTO result1 = ipos.getResult();
+                            if (result1 != null) {
+                                orderId = result1.getOrderId();
+                                channelCode = PlatformChannelEnum.C_POS.getChannelCode();
+                            }
+                        }else {
                             orderId = eorderDTO.getEorderId();
                             channelCode = PlatformChannelEnum.getEnumByChannelCodeOrder(eorderDTO.getChannelCode()).getChannelCode();
                         }