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 new file mode 100644 index 0000000..fff717d --- /dev/null +++ b/Ylt/ms-task/src/main/java/com/charge/task/controller/ManualOrderStatusHandlerByOrderNoController.java @@ -0,0 +1,58 @@ +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.charge.util.ResultVO; +import com.charge.util.ToolDateTime; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang.StringUtils; +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; + +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +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 { + + @Autowired + EquipmentChargeOrderDOMapper equipmentChargeOrderDOMapper; + + @Autowired + AsyncTaskService asyncTaskService; + + @Autowired + HandleOrderTarckService handleOrderTarckService; + + /******************************************************************************************/ + /** + * Add By HuangHai 2024-08-13 + * 功能:对于指定的订单号,进行补单【正向】 + * + * @param orderNo + * @return + */ + @PostMapping("/completeUnReportOrderByOrderNo") + public ResultVO completeUnReportOrderByOrderNo(String orderNo) { + //查询挂起订单 + EquipmentChargeOrderDO hangUpOrder = equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo(orderNo); + asyncTaskService.completeUnReportOrder(hangUpOrder); + return ResultVO.success(); + } + /******************************************************************************************/ +} diff --git a/Ylt/ms-task/src/main/java/com/charge/task/controller/ManualOrderStatusHandlerController.java b/Ylt/ms-task/src/main/java/com/charge/task/controller/ManualOrderStatusHandlerController.java index 751d4e7..049ae82 100644 --- a/Ylt/ms-task/src/main/java/com/charge/task/controller/ManualOrderStatusHandlerController.java +++ b/Ylt/ms-task/src/main/java/com/charge/task/controller/ManualOrderStatusHandlerController.java @@ -39,23 +39,6 @@ public class ManualOrderStatusHandlerController { @Autowired HandleOrderTarckService handleOrderTarckService; - /******************************************************************************************/ - /** - * Add By HuangHai 2024-08-13 - * 功能:对于指定的订单号,进行补单【正向】 - * - * @param orderNo - * @return - */ - @PostMapping("/completeUnReportOrderByOrderNo") - public ResultVO completeUnReportOrderByOrderNo(String orderNo) { - //查询挂起订单 - EquipmentChargeOrderDO hangUpOrder = equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo(orderNo); - asyncTaskService.completeUnReportOrder(hangUpOrder); - return ResultVO.success(); - } - /******************************************************************************************/ - @ApiOperation("批量处理挂起正向订单,进行补单") @PostMapping("/completeUnReportOrder") public ResultVO completeUnReportOrder(String startDate, String endDate) { 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 b3dcd24..ad850fd 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 @@ -117,6 +117,7 @@ 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 e8c06bd..9bd53dc 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 aa6b723..8e30886 100644 Binary files a/Ylt/ms-task/target/ms-task.jar.original and b/Ylt/ms-task/target/ms-task.jar.original differ