From 14f55cd77189bae10627277a2a3dab9cec5fcada Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 14 十月 2025 18:43:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
index 88cc9c4..c1db0bb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
@@ -447,6 +447,11 @@
// 先退分账 在退订单
// 查出采购单 算出价格 下单 算出应该分佣金额 应该分给谁
TErpProcurement erpProcurement = erpProcurementService.getById(id);
+ if(erpProcurement.getStatus()==2){
+ erpProcurement.setStatus(6);
+ erpProcurementService.updateById(erpProcurement);
+ return R.ok("操作成功");
+ }
// 还未分账成功不能退款
if(erpProcurement.getStatus()==null || erpProcurement.getStatus()!=1){
--
Gitblit v1.7.1