管乐迷商城改造

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentRouteOrderServiceImpl.java

@@ -544,15 +544,15 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                 outOrderInfoDto.setCoopName(cooperationOrgan.getName());
             }
         }
+        BigDecimal goodsAmount = BigDecimal.ZERO;
         List<SellOrder> sellOrders = sellOrderService.getDao().getOrderSellOrder(orderId);
         if(CollectionUtils.isNotEmpty(sellOrders)){
-            BigDecimal goodsAmount = sellOrders.stream().map(SellOrder::getActualAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+            goodsAmount = sellOrders.stream().map(SellOrder::getActualAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
             outOrderInfoDto.setSellOrders(sellOrders);
-            BigDecimal serviceAmount = outOrderInfoDto.getStudentPaymentOrder().getActualAmount().subtract(goodsAmount);
-            outOrderInfoDto.setServiceAmount(serviceAmount);
             outOrderInfoDto.setGoodsAmount(goodsAmount);
         }
-
+        BigDecimal serviceAmount = outOrderInfoDto.getStudentPaymentOrder().getActualAmount().subtract(goodsAmount);
+        outOrderInfoDto.setServiceAmount(serviceAmount);
         return outOrderInfoDto;
     }