1

ydd_mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java

@@ -3126,6 +3126,9 @@ public class FrontOrderServiceImpl implements FrontOrderService {
         List<OrderMerchantRequest> orderMerchantRequestList = request.getOrderMerchantRequestList();
         // 计算运费
         UserAddress userAddress = userAddressService.getById(request.getAddressId());
+
+
+        //////
         orderInfoVo.getMerchantOrderVoList().forEach(e -> {
             orderMerchantRequestList.forEach(o -> {
                 if (o.getMerId().equals(e.getMerId())) {
@@ -3153,6 +3156,12 @@ public class FrontOrderServiceImpl implements FrontOrderService {
 //                priceResponse.setPackingFee(new BigDecimal(merchantMarket.getPackingFee()));
 //            }
         });
+
+        BigDecimal firstDeduc =  orderInfoVo.getMerchantOrderVoList().stream()
+                .map(e -> {
+                    return ObjectUtil.isNull(e.getFirstDeduc())?BigDecimal.ZERO:e.getFirstDeduc();
+                })
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
         //计算打包费
 
         //计算运费
@@ -3239,7 +3248,7 @@ public class FrontOrderServiceImpl implements FrontOrderService {
                     priceResponse.setUsedIntegral(usedIntegral);
                 }
             }
-            payPrice = payPrice.subtract(deductionPrice);
+            payPrice = payPrice.subtract(deductionPrice).subtract(firstDeduc);
             priceResponse.setPayFee(payPrice.add(priceResponse.getFreightFee()).add(priceResponse.getPackingFee()));
             priceResponse.setDeductionPrice(deductionPrice);
             priceResponse.setIsUseIntegral(true);