|
|
@@ -73,7 +73,7 @@ public class LiveOrderController extends AppBaseController
|
|
|
if (ObjectUtil.isNull(order)) {
|
|
|
throw new CustomException("订单不存在");
|
|
|
}
|
|
|
- if (order.getStatus() <2) {
|
|
|
+ if (order.getStatus() < 2) {
|
|
|
throw new CustomException("未发货订单不能查询");
|
|
|
}
|
|
|
return liveOrderService.getExpressMulti(order);
|
|
|
@@ -211,42 +211,6 @@ public class LiveOrderController extends AppBaseController
|
|
|
}
|
|
|
return R.ok().put("data",expressInfoDTO);
|
|
|
}
|
|
|
-// @Login
|
|
|
-// @GetMapping(value = "/getExpress/{id}")
|
|
|
-// public R getExpress(@PathVariable("id") String id)
|
|
|
-// {
|
|
|
-// LiveOrder order=liveOrderService.selectLiveOrderByOrderId(id);
|
|
|
-// ExpressInfoDTO expressInfoDTO=null;
|
|
|
-// if(StringUtils.isNotEmpty(order.getDeliverySn())){
|
|
|
-// String lastFourNumber = "";
|
|
|
-// if (order.getDeliveryCode().equals(ShipperCodeEnum.SF.getValue())) {
|
|
|
-//
|
|
|
-// lastFourNumber = order.getUserPhone();
|
|
|
-// if (lastFourNumber.length() == 11) {
|
|
|
-// lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
|
|
|
-// }else if (lastFourNumber.length()>11){
|
|
|
-// String jm = decryptPhone(lastFourNumber);
|
|
|
-// lastFourNumber = StrUtil.sub(jm, jm.length(), -4);
|
|
|
-// }
|
|
|
-// }
|
|
|
-// expressInfoDTO=expressService.getExpressInfo(order.getOrderCode(),order.getDeliveryCode(),order.getDeliverySn(),lastFourNumber);
|
|
|
-//
|
|
|
-// if((expressInfoDTO.getStateEx()!=null&&expressInfoDTO.getStateEx().equals("0"))&&(expressInfoDTO.getState()!=null&&expressInfoDTO.getState().equals("0"))){
|
|
|
-// lastFourNumber = "19923690275";
|
|
|
-// if (order.getDeliveryCode().equals(ShipperCodeEnum.SF.getValue())) {
|
|
|
-// if (lastFourNumber.length() == 11) {
|
|
|
-// lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
|
|
|
-// }
|
|
|
-// }
|
|
|
-//
|
|
|
-// expressInfoDTO=expressService.getExpressInfo(order.getOrderCode(),order.getDeliveryCode(),order.getDeliverySn(),lastFourNumber);
|
|
|
-//
|
|
|
-// }
|
|
|
-// }
|
|
|
-// return R.ok().put("data",expressInfoDTO);
|
|
|
-// }
|
|
|
-
|
|
|
-
|
|
|
|
|
|
/**
|
|
|
* 支付订单
|
|
|
@@ -264,7 +228,6 @@ public class LiveOrderController extends AppBaseController
|
|
|
public R aliPayment(@Validated @RequestBody FsUserLiveOrderPayUParam param)
|
|
|
{
|
|
|
param.setUserId(Long.parseLong(getUserId()));
|
|
|
-// return liveOrderService.aliPayment(param);
|
|
|
return R.ok();
|
|
|
}
|
|
|
|
