Merge branch 'feature-recommend' into 'developer'

获取eventType对象修改

See merge request !2752

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

@@ -136,7 +136,7 @@ public class InteractRecordMessageService {
 
             // 组装扩展信息
             if (MaterialInteractRecordEventType.VISIT_PRODUCT.getCode()
-                    .equals(interactRecordMessageBO.getEventType())
+                    .equals(interactRecordBO.getEventType())
                     || MaterialInteractRecordEventType.ADD_SHOPPING_CART.getCode().equals(interactRecordBO.getEventType())) {
 
                 if (MaterialInteractRecordEventType.ADD_SHOPPING_CART.getCode().equals(interactRecordBO.getEventType())
@@ -145,10 +145,6 @@ public class InteractRecordMessageService {
                     log.info("当前为加入购物车事件，且之前不是加入购物车事件，则清空关联的商品信息");
                     interactRecordBO.getExtendInfo().setGoodsIds(Lists.newArrayList());
                 }
-                // 当前为加入购物车事件，且之前不是加入购物车事件，则跳过更新关联的goodsId
-                boolean skip = !MaterialInteractRecordEventType.ADD_SHOPPING_CART.getCode().equals(interactRecordBO.getEventType())
-                        && MaterialInteractRecordEventType.ADD_SHOPPING_CART.getCode().equals(oldEventType);
-                if (!skip) {
                 // 浏览商品
                 if (StringUtils.isNotBlank(interactRecordMessageBO.getGoodsId())
                         && !interactRecordBO.getExtendInfo()
@@ -157,7 +153,6 @@ public class InteractRecordMessageService {
                             .add(interactRecordMessageBO.getGoodsId());
                 }
             }
-            }
 
             if (MaterialInteractRecordEventType.ORDER.getCode().equals(interactRecordMessageBO.getEventType())) {
                 // 下单