From 7062b7dd52b03e1cb5a573268e773bf697b04dea Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Wed, 9 Aug 2023 22:38:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E6=97=B6=E7=8A=B6=E6=80=81=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=20+=20=E9=80=80=E6=AC=BE=E6=9C=AA=E9=80=80=E5=8A=A0?= =?UTF-8?q?=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/order/OrderDetailController.java | 11 +++++++++++ .../web/controller/order/OrderMasterController.java | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index b8a176fe..4315fef8 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -41,6 +41,7 @@ import com.ghy.worker.service.WorkerService; import com.huifu.adapay.core.exception.BaseAdaPayException; import org.apache.commons.collections.CollectionUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.ModelMap; @@ -101,6 +102,8 @@ public class OrderDetailController extends BaseController { private OrderBehaviorService orderBehaviorService; @Resource private IWxMsgService wxMsgService; + @Resource + private ThreadPoolTaskExecutor executor; @RequiresPermissions("order:detail:view") @GetMapping() @@ -895,6 +898,14 @@ public class OrderDetailController extends BaseController { financialMasterService.updateFinancialMaster(financialMaster); // 删除子财务单 financialDetailService.deleteFinancialDetailByOrderDetailId(orderDetail.getId()); + // 退换加价费用 + List fcrList = financialChangeRecordService.selectByDetailIds(orderDetail.getId().toString()); + // 先把这个子单的加价单全退了 + for (FinancialChangeRecord fcr : fcrList) { + if (PayStatus.PAID.getCode().equals(fcr.getPayStatus()) || PayStatus.PAYED_ADD.getCode().equals(fcr.getPayStatus())) { + executor.execute(() -> financialChangeRecordService.refund(om.getDeptId(), fcr.getId())); + } + } // 退回旧商品 // List goodsList = orderGoodsService.selectByOrderDetailId(orderDetail.getId()); // goodsList.forEach(orderGoods -> { diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index dc2150c5..08c92fb7 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -9,6 +9,7 @@ import com.ghy.common.core.page.TableDataInfo; import com.ghy.common.core.page.TableSupport; import com.ghy.common.enums.BusinessType; import com.ghy.common.enums.ImgType; +import com.ghy.common.enums.OrderStatus; import com.ghy.common.utils.ExceptionUtil; import com.ghy.common.utils.StringUtils; import com.ghy.common.utils.poi.ExcelUtil; @@ -752,6 +753,10 @@ public class OrderMasterController extends BaseController { @ResponseBody public AjaxResult callCustomer(@RequestBody OrderMaster orderMaster) { try { + OrderMaster result = orderMasterService.selectById(orderMaster.getId()); + if (result.getTimeout() == 1 && OrderStatus.PLAIN.code() == result.getOrderStatus()) { + orderMaster.setTimeout(0); + } int i = orderMasterService.updateOrderMaster(orderMaster); if(i > 0){ OrderCallRecord param = new OrderCallRecord();