From 96e622e737ec7d0b9f3a64ecc4e4a53389a207a2 Mon Sep 17 00:00:00 2001
From: JiangYouYao <ak473600000>
Date: Fri, 18 Mar 2022 17:00:09 +0800
Subject: [PATCH] 重构:订单取消逻辑

---
 zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
index c31ba85..fa7bb7d 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
@@ -149,7 +149,7 @@
         sysOrder.setIsHasRefund(SysOrder.IS_HAS_REFUND_N);
         //校验订单是否满足结算调价,新订单则保存订单,已有订单则删除后更新
         sysOrder = orderService.checkAndSaveOrder(sysOrder);
-        orderService.updateReceiptMoney(sysOrder);
+        orderService.payOrder(sysOrder);
 
         //发送微信公众号提醒
         UniformMsgParam uniformMsgParam = new UniformMsgParam(user.getCompanyId(), UniformMsgParam.GZH_GMCG);
@@ -180,7 +180,7 @@
                 }
             }
         }
-        orderService.refundOrderMoney(sysOrder);
+        orderService.orderTk(sysOrder);
         //处理用户购买的产品
         return AjaxResult.buildSuccessInstance(Arrays.asList(sysOrder), "订单退款成功");
     }
@@ -259,7 +259,7 @@
     @RequestMapping(value = "/sk")
     public @ResponseBody
     AjaxResult sk(SysOrder order) throws GlobleException {
-        orderService.updateReceiptMoney(order);
+        orderService.payOrder(order);
         return new AjaxResult(AjaxResult.STATUS_SUCCESS, "收款成功");
     }
 

--
Gitblit v1.9.1