对接促销算价Alpha->fix

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

@@ -547,6 +547,18 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 coupon.setActivityCode(activityCode);
                 coupons.add(coupon);
             }
+            List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList = shoppingCartInfoRequestVo.getSendGoods();
+            List<ShoppingCartInfoRequestVo.SendGoods> sendGoods = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(sendGoodsList)) {
+                for (ShoppingCartInfoRequestVo.SendGoods sds : sendGoodsList) {
+                    ShoppingCartInfoRequestVo.SendGoods sd = new ShoppingCartInfoRequestVo.SendGoods();
+                    sd.setGoodsId(sds.getGoodsId());
+                    sd.setQty(sds.getQty());
+                    sd.setOriginalPrice(sds.getOriginalPrice());
+                    sd.setActivityCode(sds.getActivityCode());
+                    sendGoods.add(sd);
+                }
+            }
             CalculationSharingDiscountResponseDto.CalculationDiscountResult calculationSharingDiscountResult = sharingDiscountService.getCalculationSharingDiscountResult(menuType
                     , partnerId
                     , storeId
@@ -556,7 +568,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , assortmentCustomerInfoVo.isMemberPaid()
                     , cartGoodsList
                     , coupons
-                    , null
+                    , sendGoods
                     , deliveryAmount);
             sharingCartService.distribute(calculationSharingDiscountResult
                     , cartGoodsList

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

@@ -69,7 +69,7 @@ public class CalculationCommonService {
             amount = cartGoods.getAmount();
             totalAmount += amount;
             //原价行记录
-            originalAmount = cartGoods.getOriginalPrice();
+            originalAmount = cartGoods.getOriginalPrice() * cartGoods.getQty();
             cartGoods.setOriginalAmount(originalAmount);
             totalOriginalAmount += originalAmount;
             //包装费行记录
@@ -108,7 +108,7 @@ public class CalculationCommonService {
                 original += choice.getOriginalPrice() * cartGoods.getQty();
             } else {
                 amount += mt.getRealAmount();
-                original += mt.getOriginalPrice();
+                original += mt.getOriginalPrice() * cartGoods.getQty();
                 choice.setAmount(mt.getRealAmount().longValue());
                 choice.setOriginalAmount(original);
             }

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

@@ -211,7 +211,7 @@ public class CalculationSharingDiscountService {
                 CalculationSharingDiscountRequestDto.CalculationDiscountGoods.Material material = new CalculationSharingDiscountRequestDto.CalculationDiscountGoods.Material();
                 material.setType(2);
                 material.setGoodsId(group.getGoodsId());
-                material.setGoodsQuantity(1);
+                material.setGoodsQuantity(cartGoods.getQty());
                 material.setOriginalPrice(group.getFinalPrice());
                 groups.add(material);
             }