From 01e0675a4e6b0b00eb3f98eef30019cdd03d4ca7 Mon Sep 17 00:00:00 2001 From: huliyong <2783385703@qq.com> Date: Thu, 3 Jul 2025 09:27:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java | 7 +++++-- .../org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java index 571bbd2..857c25f 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java @@ -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); diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java index 7dbe508..e6bccd6 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java @@ -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);