Merge branch 'feature-recommend' into 'developer'

当前为加入购物车事件，且之前不是加入购物车事件，则跳过更新关联的goodsId

See merge request !2751

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

@@ -145,6 +145,10 @@ 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()
@@ -153,6 +157,7 @@ public class InteractRecordMessageService {
                                 .add(interactRecordMessageBO.getGoodsId());
                     }
                 }
+            }
 
             if (MaterialInteractRecordEventType.ORDER.getCode().equals(interactRecordMessageBO.getEventType())) {
                 // 下单