update 财务添加订单

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/OutOrderInfoDto.java

@@ -7,7 +7,9 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.List;
 
-public class OutOrderInfoDto extends StudentPaymentOrder {
+public class OutOrderInfoDto {
+
+    private StudentPaymentOrder StudentPaymentOrder;
 
     @ApiModelProperty(value = "服务收入",required = true)
     private BigDecimal serviceAmount = BigDecimal.ZERO;
@@ -40,4 +42,12 @@ public class OutOrderInfoDto extends StudentPaymentOrder {
     public void setGoodsAmount(BigDecimal goodsAmount) {
         this.goodsAmount = goodsAmount;
     }
+
+    public com.ym.mec.biz.dal.entity.StudentPaymentOrder getStudentPaymentOrder() {
+        return StudentPaymentOrder;
+    }
+
+    public void setStudentPaymentOrder(com.ym.mec.biz.dal.entity.StudentPaymentOrder studentPaymentOrder) {
+        StudentPaymentOrder = studentPaymentOrder;
+    }
 }

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentRouteOrderController.java

@@ -102,11 +102,12 @@ public class StudentPaymentRouteOrderController extends BaseController {
     @ApiOperation(value = "获取订单信息")
     @GetMapping("/getOrderInfo")
     @PreAuthorize("@pcs.hasPermissions('routeOrder/getOrderInfo')")
-    public HttpResponseResult<OutOrderInfoDto> add(Long orderId) {
-        OutOrderInfoDto outOrderInfoDto = (OutOrderInfoDto) studentPaymentOrderDao.get(orderId);
+    public HttpResponseResult<OutOrderInfoDto> getOrderInfo(Long orderId) {
+        OutOrderInfoDto outOrderInfoDto = new OutOrderInfoDto();
+        outOrderInfoDto.setStudentPaymentOrder(studentPaymentOrderDao.get(orderId));
         List<SellOrder> sellOrders = sellOrderDao.getOrderSellOrder(orderId);
         BigDecimal goodsAmount = sellOrders.stream().map(SellOrder::getActualAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-        BigDecimal serviceAmount = outOrderInfoDto.getActualAmount().subtract(goodsAmount);
+        BigDecimal serviceAmount = outOrderInfoDto.getStudentPaymentOrder().getActualAmount().subtract(goodsAmount);
         outOrderInfoDto.setServiceAmount(serviceAmount);
         outOrderInfoDto.setGoodsAmount(goodsAmount);
         outOrderInfoDto.setSellOrders(sellOrders);