提交 6169eafc 作者: zhenjie

商城订单-修改

上级 3d546d4b
...@@ -235,7 +235,7 @@ public class UavOrderServiceImpl implements UavOrderService { ...@@ -235,7 +235,7 @@ public class UavOrderServiceImpl implements UavOrderService {
public ResultBody pay(Integer id, BaseAccountDTO currentAccount, HttpServletRequest request) { public ResultBody pay(Integer id, BaseAccountDTO currentAccount, HttpServletRequest request) {
// 发起微信支付 // 发起微信支付
UavOrderDO uavOrderDO = uavOrderDao.detail(id); UavOrderDO uavOrderDO = uavOrderDao.detail(id);
if (uavOrderDO.getStatusCode().toString().equals(UavOrderStatus.PAYING.getCode().toString())) { if (!uavOrderDO.getStatusCode().toString().equals(UavOrderStatus.PAYING.getCode().toString())) {
return ResultBody.error("操作有误,请重试!"); return ResultBody.error("操作有误,请重试!");
} }
CommonPaymentVO commonPaymentVO = new CommonPaymentVO(); CommonPaymentVO commonPaymentVO = new CommonPaymentVO();
...@@ -248,7 +248,7 @@ public class UavOrderServiceImpl implements UavOrderService { ...@@ -248,7 +248,7 @@ public class UavOrderServiceImpl implements UavOrderService {
public ResultBody send(UavOrderExpressVO param) { public ResultBody send(UavOrderExpressVO param) {
// 修改订单状态 // 修改订单状态
UavOrderDO uavOrderDO = uavOrderDao.detail(param.getUavOrderId()); UavOrderDO uavOrderDO = uavOrderDao.detail(param.getUavOrderId());
if (uavOrderDO.getStatusCode().toString().equals(UavOrderStatus.WAITING_DELIVER_GOODS.getCode().toString())) { if (!uavOrderDO.getStatusCode().toString().equals(UavOrderStatus.WAITING_DELIVER_GOODS.getCode().toString())) {
return ResultBody.error("操作有误,请重试!"); return ResultBody.error("操作有误,请重试!");
} }
this.updateUavOrderStatus(param.getUavOrderId(), UavOrderStatus.WAITING_DELIVER_GOODS); this.updateUavOrderStatus(param.getUavOrderId(), UavOrderStatus.WAITING_DELIVER_GOODS);
...@@ -262,7 +262,7 @@ public class UavOrderServiceImpl implements UavOrderService { ...@@ -262,7 +262,7 @@ public class UavOrderServiceImpl implements UavOrderService {
public ResultBody receive(Integer id) { public ResultBody receive(Integer id) {
// 修改订单状态 // 修改订单状态
UavOrderDO uavOrderDO = uavOrderDao.detail(id); UavOrderDO uavOrderDO = uavOrderDao.detail(id);
if (uavOrderDO.getStatusCode().toString().equals(UavOrderStatus.WAITING_RECEIVE_GOODS.getCode().toString())) { if (!uavOrderDO.getStatusCode().toString().equals(UavOrderStatus.WAITING_RECEIVE_GOODS.getCode().toString())) {
return ResultBody.error("操作有误,请重试!"); return ResultBody.error("操作有误,请重试!");
} }
this.updateUavOrderStatus(id, UavOrderStatus.WAITING_RECEIVE_GOODS); this.updateUavOrderStatus(id, UavOrderStatus.WAITING_RECEIVE_GOODS);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论