From 6a06a29e544e471d503d72433cf76abac576ecda Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 27 Jul 2022 16:09:01 +0800 Subject: [PATCH] log --- business/model/dao/dao_order.go | 9 ++++----- business/q_bida/q_bida_server.go | 11 +++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index 9a54fed98..48e4ea908 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -126,7 +126,7 @@ type GetOrdersResult struct { var TableOrder = "order" -func GetOrderByID(db *DaoDB, orderID string) (orderInfos *model.Order, err error) { +func GetOrderByID(db *DaoDB, orderID string) (*model.Order, error) { sql := `SELECT * FROM order WHERE deleted_at = ? ` sqlParams := []interface{}{ utils.DefaultTimeValue, @@ -135,12 +135,11 @@ func GetOrderByID(db *DaoDB, orderID string) (orderInfos *model.Order, err error sql += "AND order_id = ?" sqlParams = append(sqlParams, TableOrder, orderID) } - txDB, _ := Begin(db) - defer Commit(db, txDB) - if err = GetRowsTx(txDB, &orderInfos, sql, sqlParams); err != nil { + orderInfos := &model.Order{} + if err := GetRow(db, orderInfos, sql, sqlParams); err != nil { return nil, err } - return orderInfos, err + return orderInfos, nil } func GetOrders(db *DaoDB, orderID, userID string, orderType int, cityCodes []int, fromTime, toTime time.Time, keyword string, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { diff --git a/business/q_bida/q_bida_server.go b/business/q_bida/q_bida_server.go index 6b6c531a9..e21d87cf1 100644 --- a/business/q_bida/q_bida_server.go +++ b/business/q_bida/q_bida_server.go @@ -254,22 +254,21 @@ func CancelWayOrder(ctx *jxcontext.Context, userId string, param *bida.CancelOrd } // 暂时考虑余额支付渠道，加载order表判断支付渠道方式 orderWay, err := dao.GetOrderByID(db, tmp_orderNo) - order1 := *orderWay - globals.SugarLogger.Debug("============", &order1.PayPrice) - globals.SugarLogger.Debug("========= dfedfwfwdsw", &order1.PayMethod) if err != nil { return err } + globals.SugarLogger.Debug("orderWay.PayPrice==============", orderWay.PayPrice) + globals.SugarLogger.Debug("orderWay.PayMethod==============", orderWay.PayMethod) //orderWay := &model.Order{OrderID: param.OrderNo, UserID: userId} //if err := dao.GetEntity(dao.GetDB(), orderWay, "OrderID", "UserID"); err != nil { // return err //} - if order1.PayMethod == 1 { // 余额支付 + if orderWay.PayMethod == 1 { // 余额支付 // 支付方式为余额支付，则需要修改order/userVendorOrder，修改订单状态，给用户账户价钱，生成一个价钱数据 - } else if order1.PayMethod == 2 { // 微信支付 + } else if orderWay.PayMethod == 2 { // 微信支付 // 微信支付原路退款，发起退款申请 - _, err := RefundOrderByTL(ctx, &order1, order, order.OtherWayBill, int(order.ChannelFee*100), "申请退款") + _, err := RefundOrderByTL(ctx, orderWay, order, order.OtherWayBill, int(order.ChannelFee*100), "申请退款") return err }