From 9d2babb8bb99d55d76eab0558fd9f510652b270c Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期二, 11 六月 2024 15:16:17 +0800 Subject: [PATCH] 6.11 --- UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/InvoiceServiceImpl.java | 46 +++++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 21 deletions(-) diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/InvoiceServiceImpl.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/InvoiceServiceImpl.java index 2502751..f325467 100644 --- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/InvoiceServiceImpl.java +++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/InvoiceServiceImpl.java @@ -4,11 +4,19 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.stylefeng.guns.modular.CharteredCar.model.OrderCharteredCar; +import com.stylefeng.guns.modular.CharteredCar.server.IOrderCharteredCarService; +import com.stylefeng.guns.modular.crossCity.dao.OrderCrossCityMapper; +import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity; +import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService; +import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar; +import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService; import com.stylefeng.guns.modular.system.dao.InvoiceMapper; import com.stylefeng.guns.modular.system.model.Invoice; import com.stylefeng.guns.modular.system.service.IInvoiceService; import com.stylefeng.guns.modular.taxi.model.OrderTaxi; import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService; +import com.stylefeng.guns.modular.transfer.model.OrderTransferCar; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,6 +36,12 @@ @Autowired private IOrderTaxiService orderTaxiService; + @Autowired + private IOrderPrivateCarService orderPrivateCarService; + @Autowired + private IOrderCrossCityService crossCityService; + @Autowired + private IOrderCharteredCarService orderCharteredCarService; /** @@ -46,16 +60,26 @@ Integer orderId = jsonObject.getIntValue("id"); switch (orderType){ case 1://专车 + OrderPrivateCar privateCar= orderPrivateCarService.selectById(orderId); + sum.add(new BigDecimal(privateCar.getPayMoney())); break; case 2://出租车 OrderTaxi orderTaxi = orderTaxiService.selectById(orderId); sum.add(new BigDecimal(orderTaxi.getPayMoney())); break; case 3://跨城出行 + OrderCrossCity orderCrossCity = crossCityService.selectById(orderId); + sum.add(new BigDecimal(orderCrossCity.getPayMoney())); break; case 4://同城小件物流 break; case 5://跨城小件物流 + break; +// case 6://包车 +// OrderCharteredCar orderCharteredCar = orderCharteredCarService.selectById(orderId); +// sum.add(new BigDecimal(orderCharteredCar.getPayMoney())); +// break; + case 7://接送机 break; } } @@ -67,28 +91,8 @@ invoice.setState(1); this.insert(invoice); // TODO: 2020/6/9 调用开发票第三方SDK + String.valueOf(invoice.getMoney()); - - for(int i = 0; i < jsonArray.size(); i++){ - JSONObject jsonObject = jsonArray.getJSONObject(i); - Integer orderType = jsonObject.getIntValue("type"); - Integer orderId = jsonObject.getIntValue("id"); - switch (orderType){ - case 1://专车 - break; - case 2://出租车 - OrderTaxi orderTaxi = orderTaxiService.selectById(orderId); - orderTaxi.setInvoiceId(invoice.getId()); - orderTaxiService.updateById(orderTaxi); - break; - case 3://跨城出行 - break; - case 4://同城小件物流 - break; - case 5://跨城小件物流 - break; - } - } } -- Gitblit v1.7.1