Merge branch 'feature-content202505' into developer

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

@@ -17,6 +17,11 @@ public class InteractRecordInfoDTO implements Serializable {
      * 会员id
      */
     private String memberId;
+
+    /**
+     * 导购id
+     */
+    private String clerkId;
     /**
      * 互动记录id
      */
@@ -106,6 +111,14 @@ public class InteractRecordInfoDTO implements Serializable {
         this.memberId = memberId;
     }
 
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
     public Long getInteractRecordId() {
         return interactRecordId;
     }

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

@@ -137,6 +137,8 @@ public class InteractRecordTest {
         InteractRecordQO interactRecordQO = new InteractRecordQO();
         interactRecordQO.setPageNum(1);
         interactRecordQO.setPageSize(100000);
+        interactRecordQO.setStartTime(new Date("2020/01/01"));
+        interactRecordQO.setEndTime(new Date("2026/01/01"));
         interactRecordQO.setEventTypeList(Lists.newArrayList(MaterialInteractRecordEventType.ORDER.getCode()));
         Page<InteractRecordBO> interactRecordBOPage = interactRecordService.queryInteractRecordPage(interactRecordQO);
         List<InteractRecordBO> result = interactRecordBOPage.getResult();
@@ -151,19 +153,20 @@ public class InteractRecordTest {
                 OrderInfoQDTO orderInfoQDTO = new OrderInfoQDTO();
                 String enterpriseId = interactRecordBO.getEnterpriseId();
                 String orderNumber = extendOrderInfo.getOrderNumber();
+                String memberId = interactRecordBO.getMemberId();
                 orderInfoQDTO.setOrderNumber(orderNumber);
                 orderInfoQDTO.setEnterpriseId(enterpriseId);
                 String orderId = "";
                 String channelCode = "";
                 ServiceResponse<OrderOutInfoDTO> serviceResponse = orderInfoOutApiService.queryOrderInfo(orderInfoQDTO);
                 if (serviceResponse.getResult() == null) {
-                    EorderDTO eorderDTO = ecommerceOrderOutputApiService.getEorderByMemberIdAndOrderNumber(memberId, PlatformChannelEnum.C_WEIMOB.getChannelCode(),orderNumber,enterpriseId);
+                    EorderDTO eorderDTO = ecommerceOrderOutputApiService.getEorderByMemberIdAndOrderNumber(memberId, PlatformChannelEnum.C_WEIMOB.getOrderChannelCodeOld(),orderNumber,enterpriseId);
                     if (eorderDTO == null) {
-                        eorderDTO = ecommerceOrderOutputApiService.getEorderByMemberIdAndOrderNumber(memberId, PlatformChannelEnum.C_BRAND_MALL.getChannelCode(),orderNumber,enterpriseId);
+                        eorderDTO = ecommerceOrderOutputApiService.getEorderByMemberIdAndOrderNumber(memberId, PlatformChannelEnum.C_BRAND_MALL.getOrderChannelCodeOld(),orderNumber,enterpriseId);
                     }
                     if (eorderDTO != null) {
                         orderId = eorderDTO.getEorderId();
-                        channelCode = eorderDTO.getChannelCode();
+                        channelCode = PlatformChannelEnum.getEnumByChannelCodeOrder(eorderDTO.getChannelCode()).getChannelCode();
                     }
                 }else {
                     orderId = serviceResponse.getResult().getOrderId();