Browse Source

修改bug

master
前端-胡立永 3 weeks ago
parent
commit
01e0675a4e
2 changed files with 6 additions and 5 deletions
  1. +5
    -2
      module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java
  2. +1
    -3
      module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java

+ 5
- 2
module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java View File

@ -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);


+ 1
- 3
module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java View File

@ -187,7 +187,7 @@ public class AppletOrderTeamServiceImpl implements AppletOrderTeamService {
commonOrder.setStatus(1);//快递上门
commonOrderService.updateById(commonOrder);
// TODO 接入物流 当物流取件完成时 修改 status=2 state=1
// TODO 接入物流下单 当物流取件完成时 修改 status=2 state=1
return Result.OK("订单审核通过");
@ -393,8 +393,6 @@ public class AppletOrderTeamServiceImpl implements AppletOrderTeamService {
orderReq.setTitle("不可回收");
}
// TODO 给质量问题和不可回收添加title和image
commonOrderService.save(orderReq);


Loading…
Cancel
Save