liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改详情

Browse Source
This commit is contained in:
邹宗楠
2022-07-01 11:25:48 +08:00
parent e45f461bfb
commit d7a234e4af
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
business/q_bida/q_bida_server.go
View File

@@ -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 = ? ` //sql := `SELECT　* FROM user_vendor_order a WHERE a.other_way_bill = ? and a.type = ? `
data := &model.UserVendorOrder{} //data := &model.UserVendorOrder{}
param := []interface{}{orderNo, typeCode} //param := []interface{}{orderNo, typeCode}
if err := dao.GetRow(dao.GetDB(), data, sql, param); err != nil { //if err := dao.GetRow(dao.GetDB(), data, sql, param); err != nil {
return nil, err // return nil, err
} //}
addFee := int(detail.PayFee*100) + detail.Weight*20
detail.ExpressFee = utils.Float64ToStr(data.ChannelFee) detail.PayFee = utils.Int2Float64(addFee) / float64(100)
return detail, nil return detail, nil
} }
@@ -252,7 +252,6 @@ func QueryUserOrderList(userId string, expressType, orderStatus int, pageNum, pa
sql = sql + ` AND a.order_status = ? ` sql = sql + ` AND a.order_status = ? `
param = append(param, orderStatus) param = append(param, orderStatus)
} }
count := dao.GetLastTotalRowCount(dao.GetDB())
// 获取数据条数 // 获取数据条数
sql = sql + ` ORDER BY a.created_at DESC LIMIT ? OFFSET ? ` 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 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 return nil, 0, err
} }
count := dao.GetLastTotalRowCountTx(tx)
tx.Commit()
return result, count, nil return result, count, nil
} }