|
|
@ -171,6 +171,9 @@ public class AppletOrderServiceImpl implements AppletOrderService { |
|
|
|
.eq(CommonOrder::getId,orderId) |
|
|
|
.one(); |
|
|
|
if(commonOrder.getState() == 0){ |
|
|
|
|
|
|
|
// TODO 如果下单物流了 取消物流 |
|
|
|
|
|
|
|
commonOrder.setState(3);//取消订单 |
|
|
|
commonOrderService.updateById(commonOrder); |
|
|
|
return Result.OK("取消订单成功"); |
|
|
@ -298,12 +301,12 @@ public class AppletOrderServiceImpl implements AppletOrderService { |
|
|
|
boolean isFreeShipping = calculateFreeShipping(commonAddress); |
|
|
|
|
|
|
|
if (isFreeShipping){ |
|
|
|
// TODO 包邮直接进行快递上门 |
|
|
|
// TODO 包邮直接进行快递上门 进行物流下单 |
|
|
|
cityOrder.setStatus(1); |
|
|
|
cityOrder.setState(0); |
|
|
|
|
|
|
|
cityOrder.setIsBy("Y"); |
|
|
|
}else {// TODO 不包邮进行审批是否值得包邮 |
|
|
|
}else {//不包邮进行审批是否值得包邮 |
|
|
|
cityOrder.setIsBy("N"); |
|
|
|
cityOrder.setStatus(0); |
|
|
|
cityOrder.setState(0); |
|
|
|