Merge branch 'feature/20191119_套餐特价' into develop

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -343,7 +343,6 @@ public class OrderServiceImpl implements Orderservice {
         ConfirmOrderRequest var1 = LightApplicationConvertToAssortmentSdkAdapter.confirmOrderDtoConvertToConfirmOrderRequest(confirmOrderDto, orderBeans.get(OrderBeanType.MERMBERORDER.getCode()));
         var1.setPartnerId(partnerId);
         var1.setStoreId(storeId);
-        var1.setOrderId(orderBean.getOid());
         var1.setOrderType(orderBean.getType());
 
         // 订单支付成功

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java

@@ -197,6 +197,10 @@ public class ActivityCalculationDiscountResponseDto {
                  * 活动类型
                  */
                 private Integer type;
+                /**
+                 * 当前活动实际优惠的商品数量
+                 */
+                private Integer actualGoodsNumber;
             }
         }
 

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

@@ -138,7 +138,8 @@ public class SetMealServiceImpl implements IPromotionService {
             return "";
         }
         if (numberMap.get(cartGoods.getGoodsId()) == null) {
-            numberMap.put(cartGoods.getGoodsId(), goodsMap.get(cartGoods.getGoodsId()).getActualGoodsNumber());
+            int actualGoodsNumber = goodsMap.get(cartGoods.getGoodsId()).getDiscounts().stream().mapToInt(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount::getActualGoodsNumber).min().getAsInt();
+            numberMap.put(cartGoods.getGoodsId(), actualGoodsNumber);
         }
         // 可优惠数量
         Integer number = numberMap.get(cartGoods.getGoodsId());