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 7794e9b..34c15fe 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 @@ -52,8 +52,8 @@ public class ManualOrderStatusHandlerByOrderNoController { public ResultVO completeUnReportOrderByOrderNo(String orderNo) { //查询挂起订单 EquipmentChargeOrderDO hangUpOrder = equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo(orderNo); - JSONObject jo = asyncTaskService.completeUnReportOrder(hangUpOrder); - return ResultVO.success(jo); + asyncTaskService.completeUnReportOrder(hangUpOrder); + return ResultVO.success(); } /******************************************************************************************/ } diff --git a/Ylt/ms-task/src/main/java/com/charge/task/service/AsyncTaskService.java b/Ylt/ms-task/src/main/java/com/charge/task/service/AsyncTaskService.java index 0317d39..08c4a38 100644 --- a/Ylt/ms-task/src/main/java/com/charge/task/service/AsyncTaskService.java +++ b/Ylt/ms-task/src/main/java/com/charge/task/service/AsyncTaskService.java @@ -109,9 +109,8 @@ public class AsyncTaskService { * @param hangUpOrderList */ @Async(value = "asyncTaskExecutor") - public JSONObject completeUnReportOrder(EquipmentChargeOrderDO hangUpOrderList) { - JSONObject res = new JSONObject(); - // EquipmentChargeOrderDO ：订单表 t_equipment_charge_order + public void completeUnReportOrder(EquipmentChargeOrderDO hangUpOrderList) { + //EquipmentChargeOrderDO ：订单表 t_equipment_charge_order // hangUpOrderList :似乎是挂起的订单列表，为什么是列表呢？不是一条记录，一个订单吗？ try { //通过t_equipment_charge_order表中，查找order_no=2020092315154430479 @@ -119,7 +118,6 @@ public class AsyncTaskService { EquipmentOrder equipmentOrder = equipmentOrderDao.findOne(hangUpOrderList.getOrderNo());//查询订单下发结束命令前的最新一笔订单信息 if (equipmentOrder == null) { log.info("completeUnReportOrder补单失败，订单号:{},mongo未查询到信息", hangUpOrderList.getOrderNo()); - res.put("msg", "completeUnReportOrder补单失败，订单号:" + hangUpOrderList.getOrderNo() + ",mongo未查询到信息"); //把mongo无记录的订单的状态置为需要手动补单的订单 //mysql数据表t_equipment_charge_order修改 /** @@ -127,22 +125,22 @@ public class AsyncTaskService { UPDATE t_equipment_charge_order SET state = 6 WHERE order_no = #{orderNo} */ equipmentChargeOrderDOMapper.setPatchStateByOrderNo(hangUpOrderList.getOrderNo()); - return res; + return; } /** 挂起的订单处于已支付状态，无需再处理 t_equipment_charge_order + pay_status 支付状态 0未支付 1待支付 2已支付 3支付失败 */ if ("2".equals(hangUpOrderList.getPayStatus().toString())) { log.info("completeUnReportOrder补单失败，订单号:{},已经支付", hangUpOrderList.getOrderNo()); - res.put("msg", "completeUnReportOrder补单失败，订单号:" + hangUpOrderList.getOrderNo() + ",已经支付"); //-- 挂起 //select state,pay_status from t_equipment_charge_order where order_no='2023122813120212560' /** state,pay_status 5 2 - state :订单状态 0 创建中 1准备充电中 2 充电中 3完成 4 取消 5挂起 6需要手动补单 7结算中 - pay_status :支付状态 0未支付 1待支付 2已支付 3支付失败 + state:订单状态 0 创建中 1准备充电中 2 充电中 3完成 4 取消 5挂起 6需要手动补单 7结算中 + pay_status:支付状态 0未支付 1待支付 2已支付 3支付失败 */ //记录日志 : t_equipment_charge_order_track @@ -152,7 +150,7 @@ public class AsyncTaskService { //state:状态 0创建中 1启动中 2充电中 3充电完成 4充电异常 5订单挂起 7结算中 101扫码启动(设备认证) 102用户启动充电 103用户主动停止 //succ_stat 操作结果 0 成功 1失败 addOrderTrack(hangUpOrderList.getOrderNo(), hangUpOrderList.getUserId(), hangUpOrderList.getConnectorId().toString(), (byte) 3, (byte) 0, "补单失败，订单已经支付，无法进行二次结算"); - return res; + return; } // t_equipment_charge_order // select count(*) from t_account_water where order_id = #{orderNo} and type = 1 @@ -161,10 +159,9 @@ public class AsyncTaskService { Integer count = equipmentChargeOrderDOMapper.getWaterCountByOrderNo(hangUpOrderList.getOrderNo()); if (count > 0) { log.info("completeUnReportOrder补单失败，订单号:{},订单已有流水，无法进行二次结算", hangUpOrderList.getOrderNo()); - res.put("msg", "completeUnReportOrder补单失败，订单号:" + hangUpOrderList.getOrderNo() + ",订单已有流水，无法进行二次结算"); //记录日志 addOrderTrack(hangUpOrderList.getOrderNo(), hangUpOrderList.getUserId(), hangUpOrderList.getConnectorId().toString(), (byte) 3, (byte) 0, "补单失败，订单已有流水，无法进行二次结算"); - return res; + return; } log.info("订单号{},补单开始", hangUpOrderList.getOrderNo()); @@ -177,14 +174,11 @@ public class AsyncTaskService { addSettleV2(lastOrderInfo, equipmentOrder, equipmentOrder.getEquipmentSn()); //补单 log.info("订单号{},补单结束", hangUpOrderList.getOrderNo()); - res.put("msg", "订单号" + hangUpOrderList.getOrderNo() + ",补单结束"); } catch (Exception e) { //记录日志 addOrderTrack(hangUpOrderList.getOrderNo(), hangUpOrderList.getUserId(), hangUpOrderList.getConnectorId().toString(), (byte) 3, (byte) 0, "补单失败，补单异常,异常信息"); log.error("订单号" + hangUpOrderList.getOrderNo() + ",补单异常,异常信息:", e); - res.put("msg", "订单号" + hangUpOrderList.getOrderNo() + ",补单异常,异常信息:"); } - return res; } /** diff --git a/Ylt/ms-task/target/ms-task.jar b/Ylt/ms-task/target/ms-task.jar index 6e78bd4..9cab598 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 97abad2..fa8e04d 100644 Binary files a/Ylt/ms-task/target/ms-task.jar.original and b/Ylt/ms-task/target/ms-task.jar.original differ