Merge branch 'feature-recommend' into 'developer'

销售线索下单修改

See merge request !2735

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/WeekMonthDataAdaptor.java

@@ -94,6 +94,13 @@ public class WeekMonthDataAdaptor {
         private String clerkId;
         private String bizId;
         private String storeId;
+        private Integer bizType;
+
+        public MaterialBizInfo(String clerkId, String bizId, String storeId) {
+            this.clerkId = clerkId;
+            this.bizId = bizId;
+            this.storeId = storeId;
+        }
     }
 
     public MaterialDataResult queryClerkReportData(MaterialReportContext context,String storeId,String bizDate) {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/message/InteractRecordMessageService.java

@@ -75,7 +75,7 @@ public class InteractRecordMessageService {
         // 根据key 查询是否存在记录
         InteractRecordBO interactRecordBO = null;
         if (MaterialInteractRecordEventType.ORDER.getCode().equals(interactRecordMessageBO.getEventType())) {
-            interactRecordBO = this.getInteractRecordBOWithOrderType(interactRecordMessageBO);
+            interactRecordBO = this.getInteractRecordBOWithOrderType(interactRecordMessageBO,context.getBizId());
             if (interactRecordBO == null) {
                 // 订单事件已过滤，理论上此处不会出现
                 log.info("下单事件 互动记录为空 {}", JSON.toJSONString(interactRecordMessageBO));
@@ -226,12 +226,8 @@ public class InteractRecordMessageService {
      * @param interactRecordMessageBO
      * @return
      */
-    public InteractRecordBO getInteractRecordBOWithOrderType(InteractRecordMessageBO interactRecordMessageBO) {
+    public InteractRecordBO getInteractRecordBOWithOrderType(InteractRecordMessageBO interactRecordMessageBO,String bizId) {
         InteractRecordBO interactRecordBO = null;
-        String bizId = interactRecordMessageBO.getMaterialId();
-        if (StringUtils.isBlank(bizId)) {
-            bizId = interactRecordMessageBO.getGoodsId();
-        }
 
         interactRecordBO = interactRecordService.queryLeastRecord(interactRecordMessageBO.getEnterpriseId(), interactRecordMessageBO.getClerkId(),
                 bizId, interactRecordMessageBO.getMemberId());