From c14c7939b1e538c8fa1e197e82f2f65468e280e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 4 Jul 2022 18:00:07 +0800
Subject: [PATCH] 1

---
 business/q_bida/q_bida_server.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/business/q_bida/q_bida_server.go b/business/q_bida/q_bida_server.go
index d6e0b3d4c..405fbd218 100644
--- a/business/q_bida/q_bida_server.go
+++ b/business/q_bida/q_bida_server.go
@@ -225,7 +225,7 @@ func CancelWayOrder(ctx *jxcontext.Context, userId string, param *bida.CancelOrd
 			return err
 		}
 		tx.Commit()
-	case model.OrderStatusSuccessPay: // 支付成功，取消三方订单，本地转取消状态，，原路退款
+	case model.OrderStatusSuccessPay, model.OrderStatusWaitPickup: // 支付成功，取消三方订单，本地转取消状态，，原路退款
 		// 发起QBiDa取消，过去取消通过，则取消本地！不通过，则不予取消!
 		api.QBiDaAPI.CancelOrder(param)
 		// 暂时考虑余额支付渠道，加载order表判断支付渠道方式
@@ -233,6 +233,7 @@ func CancelWayOrder(ctx *jxcontext.Context, userId string, param *bida.CancelOrd
 		if err := dao.GetEntity(dao.GetDB(), orderWay, "OrderID", "UserID"); err != nil {
 			return err
 		}
+
 		if orderWay.PayMethod == 1 { // 余额支付
 			// 支付方式为余额支付，则需要修改order/userVendorOrder，修改订单状态，给用户账户价钱，生成一个价钱数据
 		} else if orderWay.PayMethod == 2 { // 微信支付