Merge remote-tracking branch 'remotes/origin/feature/19.24_买一赠一活动优化'

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

@@ -86,6 +86,7 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
                 cartGoods.setStockLimit(ObjectUtils.equals(1, product.getStockLimit()));
                 cartGoods.setCustomerCode(product.getCustomerCode());
                 cartGoods.setUnit(product.getUnit());
+                cartGoods.setWeight(product.getWeight());
                 cartGoods.setQty(sendGoods.getSendNumber());
                 // nodeId标识activeCode,用于计算均摊时每个商品在每个活动上均摊金额
                 cartGoods.setNodeId(sendActivity.getActivityCode());

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

@@ -221,7 +221,7 @@ public class BuySendPromotionService implements IPromotionService {
         }
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGoods = sendGoodsMap.get(cartGood.getSpuId());
         CartGoods cartGoods = shoppingCartConvertAdapter.convent2CartGoods(cartGood, sendGoods.getNowPrice());
-        cartGoods.setQty(SEND_NUMBER);
+        cartGoods.setQty(sendGoods.getSendNumber() > 0 ? sendGoods.getSendNumber() : SEND_NUMBER);
         newCartGoodsList.add(cartGoods);
 
     }