From d1cc28c9fd86017f4a0a9013554bf1602fef8bc8 Mon Sep 17 00:00:00 2001 From: zhibing.pu <393733352@qq.com> Date: 星期二, 27 八月 2024 09:15:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java index 867f558..a46284e 100644 --- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java +++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java @@ -15,12 +15,10 @@ import com.stylefeng.guns.core.util.SinataUtil; import com.stylefeng.guns.core.util.ToolUtil; import com.stylefeng.guns.modular.system.controller.util.PushUtil; -import com.stylefeng.guns.modular.system.controller.util.TextToSpeechUtil; import com.stylefeng.guns.modular.system.dao.OrderCancelMapper; import com.stylefeng.guns.modular.system.dao.TSystemPriceMapper; import com.stylefeng.guns.modular.system.model.*; import com.stylefeng.guns.modular.system.service.*; -import com.stylefeng.guns.modular.system.util.ChinaMobileUtil; import com.stylefeng.guns.modular.system.util.GoogleMap.FleetEngineUtil; import com.stylefeng.guns.modular.system.util.HttpRequestUtil; import com.stylefeng.guns.modular.system.util.PushURL; @@ -310,11 +308,11 @@ orderPrivateCar1.setState(7); } - Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar1.getBindId(),orderPrivateCar1.getTelX()); - if(String.valueOf(map.get("code")).equals("200")){ - orderPrivateCar1.setTelX(""); - orderPrivateCar1.setBindId(""); - } +// Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar1.getBindId(),orderPrivateCar1.getTelX()); +// if(String.valueOf(map.get("code")).equals("200")){ +// orderPrivateCar1.setTelX(""); +// orderPrivateCar1.setBindId(""); +// } tOrderPrivateCarService.updateById(orderPrivateCar1); @@ -351,18 +349,16 @@ new Thread(new Runnable() { @Override public void run() { + pushUtil.frozenOrder(finalOrderPrivateCar.getDriverId(),2); pushUtil.pushOrderState(2, finalOrderPrivateCar.getDriverId(), finalOrderPrivateCar.getId(), 1, 7, 0, ""); } }).start(); } orderPrivateCar.setIsFrozen(orderPrivateCar.getIsFrozen()==1?2:1); - orderPrivateCar.setState(7); tOrderPrivateCarService.updateAllColumnById(orderPrivateCar); return SUCCESS_TIP; } - @Autowired - private ChinaMobileUtil chinaMobileUtil; @Autowired private PushUtil pushUtil; @Autowired -- Gitblit v1.7.1