diff --git a/Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForVue.java b/Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForVue.java new file mode 100644 index 0000000..a3ba6f5 --- /dev/null +++ b/Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForVue.java @@ -0,0 +1,53 @@ +package com.charge.task.controller; + +import com.charge.task.dao.EquipmentChargeOrderDOMapper; +import com.charge.task.model.EquipmentChargeOrderDO; +import com.charge.task.service.AsyncTaskService; +import com.charge.task.service.HandleOrderTarckService; +import com.jfinal.kit.Kv; +import com.jfinal.kit.StrKit; +import com.jfinal.plugin.activerecord.Record; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/orderapi/handlerOrder") +public class YltControllerForVue { + + @Autowired + EquipmentChargeOrderDOMapper equipmentChargeOrderDOMapper; + + @Autowired + AsyncTaskService asyncTaskService; + + @Autowired + HandleOrderTarckService handleOrderTarckService; + + YltModel ym = new YltModel(); + + /** + * 功能：对于指定的订单号，进行补单【正向】 + * + * @param orderNo + * @return + */ + @PostMapping("/completeUnReportOrderByOrderNo") + public Kv completeUnReportOrderByOrderNo(String orderNo) { + //查询挂起订单 + EquipmentChargeOrderDO hangUpOrder = equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo(orderNo); + asyncTaskService.completeUnReportOrder(hangUpOrder); + Record record = ym.getLastUnReportOrderByOrderNoTrack(orderNo); + String fail_reason = record.getStr("fail_reason"); + Kv kv = Kv.by("success", true).set("message", fail_reason); + //补单失败,补单异常 + if (!StrKit.isBlank(fail_reason)) { + if (fail_reason.indexOf("补单失败") >= 0 || fail_reason.indexOf("补单异常") >= 0) { + kv.set("success", false); + } + } + return kv; + } +} + diff --git a/Ylt/ms-task/src/main/java/com/charge/task/controller/YltController.java b/Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForWx.java similarity index 88% rename from Ylt/ms-task/src/main/java/com/charge/task/controller/YltController.java rename to Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForWx.java index de81068..505c227 100644 --- a/Ylt/ms-task/src/main/java/com/charge/task/controller/YltController.java +++ b/Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForWx.java @@ -7,7 +7,6 @@ import com.charge.task.model.EquipmentChargeOrderDO; import com.charge.task.service.AsyncTaskService; import com.charge.task.service.HandleOrderTarckService; import com.charge.util.CommonUtil; -import com.charge.util.ResultVO; import com.charge.util.SignUtils; import com.jfinal.kit.Kv; import com.jfinal.kit.StrKit; @@ -23,7 +22,7 @@ import java.util.UUID; @RestController @RequestMapping("/ZhuQue") -public class YltController { +public class YltControllerForWx { @Autowired EquipmentChargeOrderDOMapper equipmentChargeOrderDOMapper; @@ -36,29 +35,6 @@ public class YltController { YltModel ym = new YltModel(); - /** - * 功能：对于指定的订单号，进行补单【正向】 - * - * @param orderNo - * @return - */ - @PostMapping("/order/completeUnReportOrderByOrderNo") - public Kv completeUnReportOrderByOrderNo(String orderNo) { - //查询挂起订单 - EquipmentChargeOrderDO hangUpOrder = equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo(orderNo); - asyncTaskService.completeUnReportOrder(hangUpOrder); - Record record = ym.getLastUnReportOrderByOrderNoTrack(orderNo); - String fail_reason = record.getStr("fail_reason"); - Kv kv = Kv.by("success", true).set("message", fail_reason); - //补单失败,补单异常 - if (!StrKit.isBlank(fail_reason)) { - if (fail_reason.indexOf("补单失败") >= 0 || fail_reason.indexOf("补单异常") >= 0) { - kv.set("success", false); - } - } - return kv; - } - /** * 功能：获取当前订单是不是在有合作的道闸车场内，这样的车场停车有减免 * diff --git a/Ylt/ms-task/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/Ylt/ms-task/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 545f187..7294b0b 100644 --- a/Ylt/ms-task/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/Ylt/ms-task/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -9,7 +9,6 @@ com\charge\task\dao\UserCouponDOMapper.class com\charge\task\model\ChargeDetailsBO.class com\charge\task\model\EquipmentDO.class com\charge\task\model\OperatorHlhtConfigDO.class -com\charge\task\controller\ManualOrderStatusHandlerByOrderNoModel.class com\charge\task\momgo\model\NotificationChargeOrderInfoReqMongoDO.class com\charge\task\config\RedisCacheConfig.class com\charge\task\constants\TaskConstant$Time.class @@ -28,6 +27,7 @@ com\charge\task\rocketmq\AliyunMqProducer.class com\charge\task\dao\mongodb\EquipmentOrderDao.class com\charge\task\model\StartChargeResultBO.class com\charge\task\config\RedissonConfig.class +com\charge\task\controller\YltModel.class com\charge\task\dto\CompanyChargeDailyStatisticsGenerateDTO$CompanyChargeDailyStatisticsGenerateDTOBuilder.class com\charge\task\model\UserDO.class com\charge\task\controller\ManualOrderStatusHandlerController.class @@ -38,6 +38,7 @@ com\charge\task\dto\PriceRuleDTO.class com\charge\task\model\AccountWaterDO.class com\charge\task\dto\PriceRule.class com\charge\task\model\CompanyDO.class +com\charge\util\SignUtils.class com\charge\task\model\ChargeDetailDTO.class com\charge\task\dto\EquipmentChargeOrderDetailDTO.class com\charge\task\model\StationChargeDayReportDO.class @@ -95,6 +96,7 @@ com\charge\task\dao\IntellectLabelParamDTO.class com\charge\task\client\FinanceServiceApi.class com\charge\task\model\CompanyChargeDailyStatisticsDO.class com\charge\task\model\UserCouponDO.class +com\charge\util\CommonUtil.class com\charge\task\momgo\NotificationChargeOrderInfoReqDao.class com\charge\util\MyException.class com\charge\task\client\OrderServiceApi.class @@ -123,7 +125,6 @@ com\charge\task\service\CompanyChargeDailyStatisticsGenerateService.class com\charge\task\model\MonitorChargeBills.class com\charge\task\momgo\model\ReverseOrderInfo.class com\charge\task\client\OrderServiceApiFallBack.class -com\charge\task\controller\ManualOrderStatusHandlerByOrderNoController.class com\charge\task\model\TaxiManageDO.class com\charge\task\model\PlatformDO.class com\charge\task\service\NotifyChargingOrderInfoService.class @@ -131,6 +132,7 @@ com\charge\task\model\EquipmentChargeOrderDO$EquipmentChargeOrderDOBuilder.class com\charge\task\service\CompanyCarChargeReportService.class com\charge\config\Constant$LABEL_TYPE.class com\charge\task\model\NotifiStationStatusRes.class +com\charge\task\controller\YltControllerForWx.class com\charge\task\model\LabelDO.class com\charge\task\controller\HandleOpenapiExceptionController.class com\charge\task\rocketmq\AliyunMqProducerConfig.class @@ -138,6 +140,7 @@ com\charge\task\dao\StationChargeDayReportDOMapper.class com\charge\task\momgo\model\OrderTrackInfoDetail.class com\charge\task\client\OpenApiServiceApiFallBack.class com\charge\task\controller\CompanyCarChargeDailyReportController.class +com\charge\task\controller\YltControllerForVue.class com\charge\task\model\NoPushStationStatusBO.class com\charge\util\I100cResponse.class com\charge\task\JfinalActiveRecordPluginConfig.class diff --git a/Ylt/ms-task/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/Ylt/ms-task/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 8597999..4e399c0 100644 --- a/Ylt/ms-task/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/Ylt/ms-task/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -6,6 +6,7 @@ D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\client\ProtocolSe D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\model\ChargeInfo.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\dao\StationChargeDayReportDOMapper.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\transTask\OrderTransTask.java +D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\controller\YltControllerForWx.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\service\CompanyChargeDailyStatisticsGenerateService.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\controller\CompanyCarChargeDailyReportController.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\momgo\model\NotificationChargeOrderInfoReqMongoDO.java @@ -50,6 +51,7 @@ D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\dao\OpenapiNotify D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\dao\mongodb\EquipmentOrderDao.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\model\ChargeMarketDO.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\client\FinanceServiceApi.java +D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\controller\YltModel.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\config\AsyncConfiguration.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\dto\PriceRule.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\dao\CompanyMapper.java @@ -63,7 +65,6 @@ D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\model\OpenapiNoti D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\controller\HandlerPushOrderController.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\model\ChargeDetailsBO.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\model\EquipmentChargeOrderTrackDO.java -D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\controller\ManualOrderStatusHandlerByOrderNoModel.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\model\NotifyStationStatusDO.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\dao\mongodb\MongoTemBaseDaoImpl.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\model\RedisOrderNo.java @@ -74,6 +75,7 @@ D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\constants\TaskCon D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\model\TimeDegreeDTO.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\controller\HandleOpenapiExceptionController.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\controller\ManualOrderStatusHandlerController.java +D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\util\CommonUtil.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\dao\CompanyChargeDailyStatisticsMapper.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\service\CompanyRouteChargeService.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\dao\mongodb\MongodbBaseDao.java @@ -90,8 +92,10 @@ D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\client\FinanceSer D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\dao\EquipmentDOMapper.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\config\RedissonConfig.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\dto\SettleThirdReverseDTO.java +D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\controller\YltControllerForVue.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\dto\EquipmentChargeOrderDetailDTO.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\model\CompanyCarChargeReportDO.java +D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\util\SignUtils.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\model\LabelDO.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\dao\ActivityNewDOMapper.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\client\OrderbkApiFallBack.java @@ -119,7 +123,6 @@ D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\momgo\ReverseOrde D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\config\RedisCacheConfig.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\model\EquipmentDO.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\momgo\model\OrderTrackInfoUtil.java -D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\controller\ManualOrderStatusHandlerByOrderNoController.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\client\OrderServiceApi.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\dto\PriceRuleDTO.java D:\dsWork\YltProject\Ylt\ms-task\src\main\java\com\charge\task\dao\NotifyStationStatusDOMapper.java diff --git a/Ylt/ms-task/target/ms-task.jar b/Ylt/ms-task/target/ms-task.jar index 93dafb9..f4b3a5e 100644 Binary files a/Ylt/ms-task/target/ms-task.jar and b/Ylt/ms-task/target/ms-task.jar differ diff --git a/Ylt/ms-task/target/ms-task.jar.original b/Ylt/ms-task/target/ms-task.jar.original index dccb5f1..a678a92 100644 Binary files a/Ylt/ms-task/target/ms-task.jar.original and b/Ylt/ms-task/target/ms-task.jar.original differ