Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa

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

@@ -571,7 +571,7 @@ public class CouponServiceImpl implements CouponService {
                     }
                 }
                 // 数量
-                product.setQuantity(cartGood.getQty());
+                product.setQuantity(1);
                 productList.add(product);
             }
         } else {

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

@@ -565,8 +565,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 for (ShoppingCartInfoRequestVo.SendGoods sds : sendGoodsList) {
                     ShoppingCartInfoRequestVo.SendGoods sd = new ShoppingCartInfoRequestVo.SendGoods();
                     sd.setGoodsId(sds.getGoodsId());
+                    if (StringUtils.isBlank(sds.getActivityCode())) continue;
                     sd.setQty(sds.getQty());
-                    sd.setOriginalPrice(sds.getOriginalPrice());
+                    sd.setOriginalPrice(0L);
                     sd.setActivityCode(sds.getActivityCode());
                     sendGoods.add(sd);
                 }