diff --git a/Ylt/ms-task/src/main/java/com/charge/task/controller/ManualOrderStatusHandlerByOrderNoController.java b/Ylt/ms-task/src/main/java/com/charge/task/controller/ManualOrderStatusHandlerByOrderNoController.java index 90478c2..aa04f47 100644 --- a/Ylt/ms-task/src/main/java/com/charge/task/controller/ManualOrderStatusHandlerByOrderNoController.java +++ b/Ylt/ms-task/src/main/java/com/charge/task/controller/ManualOrderStatusHandlerByOrderNoController.java @@ -6,6 +6,7 @@ import com.charge.task.service.AsyncTaskService; import com.charge.task.service.HandleOrderTarckService; import com.charge.util.ResultVO; import com.charge.util.ToolDateTime; +import com.jfinal.kit.Kv; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Record; import com.jfinal.plugin.activerecord.SqlPara; @@ -24,12 +25,6 @@ import java.util.Date; import java.util.List; import java.util.stream.Stream; -/** - * 手动处理异常订单状态 - * - * @author hzh - * @date 2023/6/6 - */ @RestController @RequestMapping("/orderapi/handlerOrder") public class ManualOrderStatusHandlerByOrderNoController { @@ -43,7 +38,8 @@ public class ManualOrderStatusHandlerByOrderNoController { @Autowired HandleOrderTarckService handleOrderTarckService; - /******************************************************************************************/ + ManualOrderStatusHandlerByOrderNoModel mm = new ManualOrderStatusHandlerByOrderNoModel(); + /** * Add By HuangHai 2024-08-13 * 功能:对于指定的订单号,进行补单【正向】 @@ -56,10 +52,11 @@ public class ManualOrderStatusHandlerByOrderNoController { //查询挂起订单 EquipmentChargeOrderDO hangUpOrder = equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo(orderNo); asyncTaskService.completeUnReportOrder(hangUpOrder); - //通过订单号查询订单轨迹 - String sql = "select * from t_equipment_charge_order_track where order_no=? order by id desc limit 1;"; - Record record = Db.findFirst(sql, orderNo); - return ResultVO.success(record); + Record record = mm.getLastUnReportOrderByOrderNoTrack(orderNo); + short succ_stat = record.getShort("succ_stat");//操作结果 0 成功 1失败 + String succ_stat_name = succ_stat == 0 ? "成功" : "失败"; + String fail_reason = record.getStr("fail_reason"); + Kv kv = Kv.by("succ_stat", succ_stat).set("succ_stat_name", succ_stat_name).set("fail_reason", fail_reason); + return ResultVO.success(kv); } - /******************************************************************************************/ } diff --git a/Ylt/ms-task/src/main/java/com/charge/task/controller/ManualOrderStatusHandlerByOrderNoModel.java b/Ylt/ms-task/src/main/java/com/charge/task/controller/ManualOrderStatusHandlerByOrderNoModel.java new file mode 100644 index 0000000..5061cf0 --- /dev/null +++ b/Ylt/ms-task/src/main/java/com/charge/task/controller/ManualOrderStatusHandlerByOrderNoModel.java @@ -0,0 +1,20 @@ +package com.charge.task.controller; + +import com.jfinal.plugin.activerecord.Db; +import com.jfinal.plugin.activerecord.Record; + +public class ManualOrderStatusHandlerByOrderNoModel { + + /** + * 功能:查询指定订单号订单轨迹 + * + * @param orderNo + * @return + */ + public Record getLastUnReportOrderByOrderNoTrack(String orderNo) { + //通过订单号查询订单轨迹 + String sql = "select * from t_equipment_charge_order_track where order_no=? order by id desc limit 1;"; + Record record = Db.findFirst(sql, orderNo); + return record; + } +} 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 e69de29..545f187 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 @@ -0,0 +1,146 @@ +com\charge\task\momgo\model\OrderTrackInfoUtil.class +com\charge\task\dto\SettleThirdDTO.class +com\charge\task\service\CompanyService.class +com\charge\task\client\OrderbkApiFallBack.class +com\charge\task\dao\TaxiManageDOMapper.class +com\charge\task\model\ChargeMarketDO.class +com\charge\task\client\ProtocolServiceApi.class +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 +com\charge\util\StreamFunction.class +com\charge\task\service\CompanyRouteChargeService.class +com\charge\task\dao\mongodb\PriceRuleDao.class +com\charge\task\dto\EquipmentChargeOrderDTO.class +com\charge\task\service\CompanyChargeDailyStatisticsService.class +com\charge\config\Constant.class +com\charge\task\dao\CompanyMapper.class +com\charge\task\dao\NotifyStationStatusDOMapper.class +com\charge\task\service\TaskService.class +com\charge\task\dao\LabelDOMapper.class +com\charge\task\transTask\OrderTransTask.class +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\dto\CompanyChargeDailyStatisticsGenerateDTO$CompanyChargeDailyStatisticsGenerateDTOBuilder.class +com\charge\task\model\UserDO.class +com\charge\task\controller\ManualOrderStatusHandlerController.class +com\charge\task\model\EquipmentChargeOrderTrackDO.class +com\charge\util\ToolDateTime.class +com\charge\task\client\FinanceServiceApiFallBack.class +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\task\model\ChargeDetailDTO.class +com\charge\task\dto\EquipmentChargeOrderDetailDTO.class +com\charge\task\model\StationChargeDayReportDO.class +com\charge\task\constants\TaskConstant.class +com\charge\task\dto\CompanyChargeDailyStatisticsGenerateDTO.class +com\charge\util\ResultVO.class +com\charge\task\enums\ChargeOrderEnum.class +com\charge\task\dao\mongodb\MongoTemBaseDao.class +com\charge\task\service\HandleOpenapiExceptionService.class +com\charge\task\model\ChargeBillsBO.class +com\charge\task\model\SubsidyDO.class +com\charge\task\dto\SettleThirdReverseDTO.class +com\charge\task\rocketmq\HlhtMqProducer.class +com\charge\task\model\EquipmentChargeOrderDO.class +com\charge\task\model\NotifyChargeOrderInfoBO.class +com\charge\task\dto\PriceRuleDetailDTO.class +com\charge\task\mapper\BaseMapper.class +com\charge\task\model\TimeDegreeDTO.class +com\charge\task\dao\AccountWaterDOMapper.class +com\charge\task\dao\PlatformDOMapper.class +com\charge\task\dto\OutlayThirdDTO.class +com\charge\task\controller\HandlerPushOrderController.class +com\charge\task\client\OrderbkApi.class +com\charge\task\dao\mongodb\MongoTemBaseDaoImpl.class +com\charge\task\model\LabelRelationDO.class +com\charge\task\dto\QueryTimeFlagInfoDTO$QueryTimeFlagInfoDTOBuilder.class +com\charge\task\client\OpenApiServiceApi.class +com\charge\task\dao\EquipmentDOMapper.class +com\charge\task\service\NotifyStationStatusService.class +com\charge\task\dao\mongodb\MongodbBaseDao.class +com\charge\task\dao\UserDOMapper.class +com\charge\task\service\HthlNotifyService.class +com\charge\task\dao\ActivityNewDOMapper.class +com\charge\task\dao\EquipmentChargeOrderDOMapper.class +com\charge\task\service\LabelService.class +com\charge\util\CommonResponse.class +com\charge\task\model\NotifyStationStatusDO.class +com\charge\task\model\CaoCaoNotify.class +com\charge\task\TaskApplication.class +com\charge\task\dao\EquipmentChargeOrderTrackDOMapper.class +com\charge\task\dao\ChargeMarketDOMapper.class +com\charge\task\dao\EquipmentChargeOrderDetailDOMapper.class +com\charge\task\momgo\OrderTrackInfoDao.class +com\charge\task\service\HandleOrderTarckService.class +com\charge\task\momgo\model\ChargeDetailDTO.class +com\charge\task\enums\ChargeOrderEnum$specialChannelOrderSource.class +com\charge\task\executetask\ScheduleTask.class +com\charge\task\constants\TaskConstant$CRUD.class +com\charge\task\controller\CompanyChargeDailyStatisticsGenerateController.class +com\charge\task\model\EquipmentChargeOrderDetailDO.class +com\charge\task\service\TokenService.class +com\charge\task\model\CompanyRouteChargeDO.class +com\charge\task\model\CompanyCarChargeReportDO.class +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\task\momgo\NotificationChargeOrderInfoReqDao.class +com\charge\util\MyException.class +com\charge\task\client\OrderServiceApi.class +com\charge\task\model\ActivityNewDO.class +com\charge\task\config\AsyncConfiguration.class +com\charge\task\service\AsyncTaskService.class +com\charge\task\model\EquipmentOrder.class +com\charge\task\model\ChargeInfo.class +com\charge\task\momgo\ReverseOrderInfoDao.class +com\charge\task\dto\QueryTimeFlagInfoDTO.class +com\charge\task\dao\CompanyCarChargeReportDOMapper.class +com\charge\task\dao\CompanyChargeDailyStatisticsMapper.class +com\charge\task\enums\ChargeOrderEnum$ChargeSettleType.class +com\charge\task\dao\OpenapiNotifyOrderInfoDOMapper.class +com\charge\util\HlhtStatusUtil.class +com\charge\task\dto\LabelUserDTO.class +com\charge\task\service\NotifyChargeCompleteInfoService.class +com\charge\task\dto\CompanyRouteChargeTimeFlagDTO.class +com\charge\task\model\OpenapiNotifyOrderInfoDO.class +com\charge\task\dao\SubsidyDOMapper.class +com\charge\task\client\ProtocolServiceApiFallBack.class +com\charge\task\model\RedisOrderNo.class +com\charge\task\momgo\model\OrderTrackInfo.class +com\charge\task\dao\CompanyRouteChargeDOMapper.class +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 +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\model\LabelDO.class +com\charge\task\controller\HandleOpenapiExceptionController.class +com\charge\task\rocketmq\AliyunMqProducerConfig.class +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\model\NoPushStationStatusBO.class +com\charge\util\I100cResponse.class +com\charge\task\JfinalActiveRecordPluginConfig.class +com\charge\task\dao\LabelRelationDOMapper.class +com\charge\task\dto\SubsidyTimeDTO.class +com\charge\task\enums\ChargeOrderEnum$State.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 da4df1a..8597999 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 @@ -63,6 +63,7 @@ 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 diff --git a/Ylt/ms-task/target/ms-task.jar b/Ylt/ms-task/target/ms-task.jar index 717f392..3537507 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 6a41e3b..fad9194 100644 Binary files a/Ylt/ms-task/target/ms-task.jar.original and b/Ylt/ms-task/target/ms-task.jar.original differ