From d7a234e4afd33c89d013f2aa028711a5f642ca32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 1 Jul 2022 11:25:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/q_bida/q_bida_server.go | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/business/q_bida/q_bida_server.go b/business/q_bida/q_bida_server.go
index db7952395..06fd2edc7 100644
--- a/business/q_bida/q_bida_server.go
+++ b/business/q_bida/q_bida_server.go
@@ -214,14 +214,14 @@ func QueryOrderDetail(typeCode int, orderNo string) (*bida.OrderDetail, error) {
 	}
 
 	// 本地查询获取真是支付快递费用
-	sql := `SELECT　* FROM user_vendor_order a WHERE a.other_way_bill = ? and a.type = ? `
-	data := &model.UserVendorOrder{}
-	param := []interface{}{orderNo, typeCode}
-	if err := dao.GetRow(dao.GetDB(), data, sql, param); err != nil {
-		return nil, err
-	}
-
-	detail.ExpressFee = utils.Float64ToStr(data.ChannelFee)
+	//sql := `SELECT　* FROM user_vendor_order a WHERE a.other_way_bill = ? and a.type = ? `
+	//data := &model.UserVendorOrder{}
+	//param := []interface{}{orderNo, typeCode}
+	//if err := dao.GetRow(dao.GetDB(), data, sql, param); err != nil {
+	//	return nil, err
+	//}
+	addFee := int(detail.PayFee*100) + detail.Weight*20
+	detail.PayFee = utils.Int2Float64(addFee) / float64(100)
 	return detail, nil
 }
 
@@ -252,7 +252,6 @@ func QueryUserOrderList(userId string, expressType, orderStatus int, pageNum, pa
 		sql = sql + ` AND a.order_status = ? `
 		param = append(param, orderStatus)
 	}
-	count := dao.GetLastTotalRowCount(dao.GetDB())
 
 	// 获取数据条数
 	sql = sql + `  ORDER BY a.created_at DESC LIMIT ? OFFSET ? `
@@ -261,9 +260,20 @@ func QueryUserOrderList(userId string, expressType, orderStatus int, pageNum, pa
 
 	// 获取数据
 	var result []*model.UserOrderList
-	if err := dao.GetRows(dao.GetDB(), &result, sql, param...); err != nil {
+	db := dao.GetDB()
+	tx, _ := dao.Begin(db)
+	defer func() {
+		if r := recover(); r != nil {
+			panic(r)
+		}
+	}()
+
+	if err := dao.GetRowsTx(tx, &result, sql, param...); err != nil {
+		tx.Rollback()
 		return nil, 0, err
 	}
+	count := dao.GetLastTotalRowCountTx(tx)
+	tx.Commit()
 
 	return result, count, nil
 }