|
|
@ -31,8 +31,7 @@ public class YltController extends Controller {
|
|
|
|
* @param order_no
|
|
|
|
* @param order_no
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Before({POST.class})
|
|
|
|
@Before({POST.class})
|
|
|
|
//@IsLoginInterface({})
|
|
|
|
@IsLoginInterface({})
|
|
|
|
// @PostMapping("/station/isThirdPartyStation")
|
|
|
|
|
|
|
|
public ResultVO isThirdPartyStation(String order_no) {
|
|
|
|
public ResultVO isThirdPartyStation(String order_no) {
|
|
|
|
Record record = ym.getThirdPartyStation(order_no);
|
|
|
|
Record record = ym.getThirdPartyStation(order_no);
|
|
|
|
if (record == null) {
|
|
|
|
if (record == null) {
|
|
|
@ -44,9 +43,8 @@ public class YltController extends Controller {
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 功能:获取用户的车牌列表
|
|
|
|
* 功能:获取用户的车牌列表
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Before({GET.class})
|
|
|
|
@Before({POST.class})
|
|
|
|
@IsLoginInterface({})
|
|
|
|
@IsLoginInterface({})
|
|
|
|
// @PostMapping("/station/getCarList")
|
|
|
|
|
|
|
|
public ResultVO getCarList() {
|
|
|
|
public ResultVO getCarList() {
|
|
|
|
//获取当前登录人员信息
|
|
|
|
//获取当前登录人员信息
|
|
|
|
int userId = Integer.parseInt(getRequest().getHeader("userId"));
|
|
|
|
int userId = Integer.parseInt(getRequest().getHeader("userId"));
|
|
|
@ -198,4 +196,26 @@ public class YltController extends Controller {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return null;
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 功能:对于指定的订单号,进行补单【正向】
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* @param orderNo
|
|
|
|
|
|
|
|
* @return
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
public ResultVO completeUnReportOrderByOrderNo(String orderNo) {
|
|
|
|
|
|
|
|
//查询挂起订单
|
|
|
|
|
|
|
|
EquipmentChargeOrderDO hangUpOrder = equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo(orderNo);
|
|
|
|
|
|
|
|
asyncTaskService.completeUnReportOrder(hangUpOrder);
|
|
|
|
|
|
|
|
Record record = ym.getLastUnReportOrderByOrderNoTrack(orderNo);
|
|
|
|
|
|
|
|
String fail_reason = record.getStr("fail_reason");
|
|
|
|
|
|
|
|
boolean success = true;
|
|
|
|
|
|
|
|
//补单失败,补单异常
|
|
|
|
|
|
|
|
if (!StrKit.isBlank(fail_reason)) {
|
|
|
|
|
|
|
|
if (fail_reason.indexOf("补单失败") >= 0 || fail_reason.indexOf("补单异常") >= 0) {
|
|
|
|
|
|
|
|
success = false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return ResultVO.custom(fail_reason, success ? 1000 : -1);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|