From 3a6d100dec00e9d59844c141290c2005a922db13 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Wed, 26 Jun 2024 11:40:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=8E=B0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/service/doctorWithdrawal.go | 40 +++++++++++++++++----------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/api/service/doctorWithdrawal.go b/api/service/doctorWithdrawal.go
index 41c2de5..213fcc9 100644
--- a/api/service/doctorWithdrawal.go
+++ b/api/service/doctorWithdrawal.go
@@ -257,23 +257,37 @@ func (r *DoctorWithdrawalService) PutDoctorWithdrawalExamine(req requests.PutDoc
 		}
 
 		// 修改问诊订单提现状态
+		orderDao := dao.OrderDao{}
+		orderInquiryDao := dao.OrderInquiryDao{}
 		for _, v := range doctorWithdrawalOrders {
 			// 获取订单数据
-			orderInquiryDao := dao.OrderInquiryDao{}
-			orderInquiry, err := orderInquiryDao.GetOrderInquiryById(v.OrderInquiryId)
-			if err != nil {
+			order, err := orderDao.GetOrderPreloadById(v.OrderId)
+			if order == nil {
 				tx.Rollback()
 				return false, errors.New("关联订单数据错误")
 			}
 
-			orderInquiryData := make(map[string]interface{})
-			orderInquiryData["is_withdrawal"] = 0
-			orderInquiryData["withdrawal_time"] = nil
-			err = orderInquiryDao.EditOrderInquiryById(tx, orderInquiry.OrderInquiryId, orderInquiryData)
+			// 修改订单数据
+			orderData := make(map[string]interface{})
+			orderData["is_withdrawal"] = 0
+			orderData["withdrawal_time"] = nil
+
+			err = orderDao.EditOrderById(tx, v.OrderId, orderData)
 			if err != nil {
 				tx.Rollback()
 				return false, errors.New("回滚关联订单数据失败")
 			}
+
+			if order.OrderType == 1 {
+				orderInquiryData := make(map[string]interface{})
+				orderInquiryData["is_withdrawal"] = 0
+				orderInquiryData["withdrawal_time"] = nil
+				err = orderInquiryDao.EditOrderInquiryById(tx, order.OrderInquiry.OrderInquiryId, orderInquiryData)
+				if err != nil {
+					tx.Rollback()
+					return false, errors.New("操作关联订单数据失败")
+				}
+			}
 		}
 	}
 
@@ -328,7 +342,6 @@ func (r *DoctorWithdrawalService) PutDoctorWithdrawalPayment(withdrawalId, admin
 	// 修改问诊订单提现状态
 	orderDao := dao.OrderDao{}
 	orderInquiryDao := dao.OrderInquiryDao{}
-	orderServicePackageDao := dao.OrderServicePackageDao{}
 	for _, v := range doctorWithdrawalOrders {
 		// 获取订单数据
 		order, err := orderDao.GetOrderPreloadById(v.OrderId)
@@ -358,17 +371,6 @@ func (r *DoctorWithdrawalService) PutDoctorWithdrawalPayment(withdrawalId, admin
 				return false, errors.New("操作关联订单数据失败")
 			}
 		}
-
-		if order.OrderType == 4 || order.OrderType == 5 {
-			orderServicePackageData := make(map[string]interface{})
-			orderServicePackageData["is_withdrawal"] = 1
-			orderServicePackageData["withdrawal_time"] = time.Now().Format("2006-01-02 15:04:05")
-			err = orderServicePackageDao.EditOrderServicePackageById(tx, order.OrderId, orderServicePackageData)
-			if err != nil {
-				tx.Rollback()
-				return false, errors.New("操作关联订单数据失败")
-			}
-		}
 	}
 
 	tx.Commit()