main^2
黄海 11 months ago
parent cd85ff1c43
commit 8113d97165

@ -4,6 +4,7 @@ import com.charge.task.dao.EquipmentChargeOrderDOMapper;
import com.charge.task.model.EquipmentChargeOrderDO; import com.charge.task.model.EquipmentChargeOrderDO;
import com.charge.task.service.AsyncTaskService; import com.charge.task.service.AsyncTaskService;
import com.charge.task.service.HandleOrderTarckService; import com.charge.task.service.HandleOrderTarckService;
import com.charge.util.ResultVO;
import com.jfinal.kit.Kv; import com.jfinal.kit.Kv;
import com.jfinal.kit.StrKit; import com.jfinal.kit.StrKit;
import com.jfinal.plugin.activerecord.Record; import com.jfinal.plugin.activerecord.Record;
@ -34,20 +35,20 @@ public class YltControllerForVue {
* @return * @return
*/ */
@PostMapping("/completeUnReportOrderByOrderNo") @PostMapping("/completeUnReportOrderByOrderNo")
public Kv completeUnReportOrderByOrderNo(String orderNo) { public ResultVO completeUnReportOrderByOrderNo(String orderNo) {
//查询挂起订单 //查询挂起订单
EquipmentChargeOrderDO hangUpOrder = equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo(orderNo); EquipmentChargeOrderDO hangUpOrder = equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo(orderNo);
asyncTaskService.completeUnReportOrder(hangUpOrder); asyncTaskService.completeUnReportOrder(hangUpOrder);
Record record = ym.getLastUnReportOrderByOrderNoTrack(orderNo); Record record = ym.getLastUnReportOrderByOrderNoTrack(orderNo);
String fail_reason = record.getStr("fail_reason"); String fail_reason = record.getStr("fail_reason");
Kv kv = Kv.by("success", true).set("message", fail_reason); boolean success = true;
//补单失败,补单异常 //补单失败,补单异常
if (!StrKit.isBlank(fail_reason)) { if (!StrKit.isBlank(fail_reason)) {
if (fail_reason.indexOf("补单失败") >= 0 || fail_reason.indexOf("补单异常") >= 0) { if (fail_reason.indexOf("补单失败") >= 0 || fail_reason.indexOf("补单异常") >= 0) {
kv.set("success", false); success = false;
} }
} }
return kv; return ResultVO.custom(fail_reason, success ? 1000 : -1);
} }
} }

@ -7,6 +7,7 @@ import com.charge.task.model.EquipmentChargeOrderDO;
import com.charge.task.service.AsyncTaskService; import com.charge.task.service.AsyncTaskService;
import com.charge.task.service.HandleOrderTarckService; import com.charge.task.service.HandleOrderTarckService;
import com.charge.util.CommonUtil; import com.charge.util.CommonUtil;
import com.charge.util.ResultVO;
import com.charge.util.SignUtils; import com.charge.util.SignUtils;
import com.jfinal.kit.Kv; import com.jfinal.kit.Kv;
import com.jfinal.kit.StrKit; import com.jfinal.kit.StrKit;
@ -41,46 +42,35 @@ public class YltControllerForWx {
* @param order_no * @param order_no
*/ */
@PostMapping("/station/isThirdPartyStation") @PostMapping("/station/isThirdPartyStation")
public Kv isThirdPartyStation(String order_no) { public ResultVO isThirdPartyStation(String order_no) {
Kv kv = Kv.create();
Record record = ym.getThirdPartyStation(order_no); Record record = ym.getThirdPartyStation(order_no);
if (record == null) { if (record == null) {
kv.set("success", false); return ResultVO.custom("不在合作的道闸车场内", -1);
kv.set("message", "不在合作的道闸车场内!");
return kv;
} }
kv.set("success", true); return ResultVO.custom("在合作的道闸车场内", 1000);
kv.set("message", "在合作的道闸车场内!");
return kv;
} }
/** /**
* *
*/ */
@PostMapping("/station/getCarList") @PostMapping("/station/getCarList")
public Kv getCarList(HttpServletRequest request) { public ResultVO getCarList(HttpServletRequest request) {
Kv kv = Kv.create();
//获取当前登录人员信息 //获取当前登录人员信息
Record user = ym.getUser(request); Record user = ym.getUser(request);
int userId = Integer.parseInt(user.get("userId")); int userId = Integer.parseInt(user.get("userId"));
List<Record> list = ym.getCarList(userId); List<Record> list = ym.getCarList(userId);
kv.set("success", true).set("message", "获取成功!").set("data", list); return ResultVO.success(list);
return kv;
} }
/** /**
* : * :
*/ */
@PostMapping("/station/SyncChargePilePay") @PostMapping("/station/SyncChargePilePay")
public Kv SyncChargePilePay(String order_no, String charge_plate_no) { public ResultVO SyncChargePilePay(String order_no, String charge_plate_no) {
Kv kv = Kv.create();
//根据订单号获取到第三方方面提供的车场信息 //根据订单号获取到第三方方面提供的车场信息
Record thirdPartyStation = ym.getThirdPartyStation(order_no); Record thirdPartyStation = ym.getThirdPartyStation(order_no);
if (thirdPartyStation == null) { if (thirdPartyStation == null) {
kv.set("success", false); return ResultVO.custom("检查到不是需要免费的道闸所在车场,无需发送减免消息!!", -1);
kv.set("message", "检查到不是需要免费的道闸所在车场,无需发送减免消息!!");
return kv;
} }
//请求地址 //请求地址
String url = thirdPartyStation.getStr("third_party_url"); String url = thirdPartyStation.getStr("third_party_url");
@ -163,8 +153,7 @@ public class YltControllerForWx {
.execute().body(); // 发送请求并获取响应体 .execute().body(); // 发送请求并获取响应体
//记录到数据库中闸机的流水记录 //记录到数据库中闸机的流水记录
ym.recordDzLog(order_no, charge_plate_no, jo.toString(), result); ym.recordDzLog(order_no, charge_plate_no, jo.toString(), result);
kv.set("success", true).set("message", "已经向科拓闸机平台发送了减免消息!").set("data", JSONObject.parseObject(result)); return ResultVO.success(JSONObject.parseObject(result));
return kv;
} else if ("智门科技".equals(name)) { } else if ("智门科技".equals(name)) {
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
jo.put("Ver", 2);//协议版本 jo.put("Ver", 2);//协议版本
@ -187,8 +176,7 @@ public class YltControllerForWx {
.execute().body(); // 发送请求并获取响应体 .execute().body(); // 发送请求并获取响应体
//记录到数据库中闸机的流水记录 //记录到数据库中闸机的流水记录
ym.recordDzLog(order_no, charge_plate_no, jo.toString(), result); ym.recordDzLog(order_no, charge_plate_no, jo.toString(), result);
kv.set("success", true).set("message", "已经向智门科技闸机平台发送了减免消息!").set("data", JSONObject.parseObject(result)); return ResultVO.success(JSONObject.parseObject(result));
return kv;
} }
} }
return null; return null;

Binary file not shown.
Loading…
Cancel
Save