Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/FullSharingService.java

@@ -85,6 +85,14 @@ public class FullSharingService {
             //调用没有加入购物车的提示语的方法
             setMessageNotInShoppingCart(messageBuilder, activityResponseDto, benefitBeanDtos, benefitBeanDto, activityList);
 
+            promotionMessageDto.setPromotionMessage(messageBuilder.toString());
+            ActivityTip activityTip = new ActivityTip();
+            activityTip.setActivityCode(promotionMessageDto.getActivityId());
+            activityTip.setActivityType(promotionMessageDto.getActivityType());
+            activityTip.setActivityName(promotionMessageDto.getPromotionMessage());
+            activityTip.setActivityList(activityList);
+            shoppingCartGoodsResponseVo.setActivityTip(activityTip);
+
             return;
         }