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

@@ -58,14 +58,11 @@ public class FullSharingService {
         activityTypeEnums.add(ActivityTypeEnum.TYPE_3);
         activityTypeEnums.add(ActivityTypeEnum.TYPE_31);
 
-        String aa = LogThreadLocal.getTrackingNo();
-
         if (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods())) {
             /**
              * 调用促销统一活动查询,过滤出参与的满减(目前只有每满减和阶梯满减)
              */
             ActivityQueryResponseDto activityQueryResponseDto = activityService.queryActivityByType(activityQueryDto, activityTypeEnums, null);
-            ApiLog.info("满减提示,getTrackingNo:{},ActivityQueryResponseDto:{}",aa, JSONObject.toJSONString(activityQueryResponseDto));
             if (null==activityQueryResponseDto || CollectionUtils.isEmpty(activityQueryResponseDto.getResult())) {
                 return;
             }
@@ -250,8 +247,6 @@ public class FullSharingService {
             notInShopping.setDeduct(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100).toString());
             notInShopping.setMaxDeduct(WebUtil.formatAmount(activityResponseDto.getMaxMoney() * 1.00 / 100).toString());
             activityList.add(notInShopping);
-            String aa = LogThreadLocal.getTrackingNo();
-            ApiLog.info("满减提示,getTrackingNo:{},TYPE_11:{}",aa, JSONObject.toJSONString(activityList));
         }
         if (Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), activityResponseDto.getActivityType())) {
             int len = benefitBeanDtos.size();
@@ -274,9 +269,6 @@ public class FullSharingService {
                 notInShopping.setDeduct(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100).toString());
                 activityList.add(notInShopping);
             }
-
-            String aa = LogThreadLocal.getTrackingNo();
-            ApiLog.info("满减提示,getTrackingNo:{},TYPE_12:{}",aa, JSONObject.toJSONString(activityList));
         }
     }
 

shopping-cart-application-service/src/main/java/cn/freemud/service/shoppingCart/impl/CocoShoppingCartRelationServiceImpl.java

@@ -129,9 +129,11 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
 
                         newProducts.add(product);
                     }
-                    newProducts.addAll(halfProduct);
                 }
 
+                // 半价商品加到购物车
+                newProducts.addAll(halfProduct);
+
                 shoppingCartGoodsResponseVo.setProducts(newProducts);
             }
         }