合并代码

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ConfirmOrderRequest.java

@@ -11,6 +11,10 @@ public class ConfirmOrderRequest extends BaseConfig {
 
     private String partnerId;
     private String storeId;
+    /**
+     * 普通订单：普通订单单号
+     * 会员卡父子订单：父订单号
+     */
     private String orderId;
     //老订单状态
     private Integer orderType;
@@ -19,7 +23,16 @@ public class ConfirmOrderRequest extends BaseConfig {
 
     private String payVoucher;
 
+    /**
+     * 订单类型为会员卡父子订单时，此字段赋值且为会员卡订单号
+     */
     private String completeOrderCode;
+    /**
+     * 商品订单单号
+     * 订单类型为普通订单时，此字段赋值且为普通订单订单号
+     * 订单类型为会员卡父子订单时，此字段赋值且为普通订单订单号
+     */
+    private String productOrderCode;
 
     private Integer timeout;
     //实际支付金额

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -235,11 +235,11 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             }
             request.setOrderSettlementDetailList(orderSettlementCreateReqs);
         }
-        request.setActualPayAmount(request.getActualPayAmount());
+        request.setActualPayAmount(confirmOrderRequest.getActualPayAmount());
         QueryOrderByIdResponse orderByIdResponse=new QueryOrderByIdResponse();
         BaseResponse<GetMemberExtendInfoResponse> extendInfo=new BaseResponse();
         try {
-            QueryByCodeResponse codeResponse = orderSdkService.getOrderInfo(confirmOrderRequest.getOrderId(), 0, confirmOrderRequest.getTrackingNo());
+            QueryByCodeResponse codeResponse = orderSdkService.getOrderInfo(confirmOrderRequest.getProductOrderCode(), 0, confirmOrderRequest.getTrackingNo());
             orderByIdResponse = orderSdkAdapter.convent2QueryOrderByIdResponse(codeResponse);
 
             GetMemberExtendInfoRequest extendInfoRequest = new GetMemberExtendInfoRequest();

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) {
-            int actualGoodsNumber = goodsMap.get(cartGoods.getGoodsId()).getDiscounts().stream().mapToInt(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount::getActualGoodsNumber).min().getAsInt();
+            int actualGoodsNumber = goodsMap.get(cartGoods.getGoodsId()).getDiscounts().stream().mapToInt(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount::getActualGoodsNumber)
+                    .min().orElse(goodsMap.get(cartGoods.getGoodsId()).getGoodsQuantity());
             numberMap.put(cartGoods.getGoodsId(), actualGoodsNumber);
         }
         // 可优惠数量