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

1

Browse Source
This commit is contained in:
richboo111
2022-09-21 09:19:01 +08:00
parent e95886f47d
commit eedbe38535
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/jxstore/cms/order.go
View File

@@ -165,7 +165,7 @@ func PayByBalance(ctx *jxcontext.Context, orderID string, isChoose, payType int,
//快递混合支付 //快递混合支付
if orderInfo.OrderType == model.OrderTypeDelivery { if orderInfo.OrderType == model.OrderTypeDelivery {
if isChoose == model.PayChooseBalance { if isChoose == model.PayChooseBalance {
// (3)使用余额且 余额大于支付金额 // (1)使用余额且 余额大于支付金额
if userBill.AccountBalance > orderInfo.PayPrice { if userBill.AccountBalance > orderInfo.PayPrice {
globals.SugarLogger.Debug("进入余额支付部分") globals.SugarLogger.Debug("进入余额支付部分")
txDB, _ := dao.Begin(db) txDB, _ := dao.Begin(db)
@@ -191,7 +191,7 @@ func PayByBalance(ctx *jxcontext.Context, orderID string, isChoose, payType int,
return nil, "更新order.Status状态失败", err return nil, "更新order.Status状态失败", err
} }
//todo 后续需增加其他订单类型 //todo 后续需增加其他订单类型
//(1)更新快递 订单状态 //更新快递 订单状态
temp_vendor_status := 4 temp_vendor_status := 4
if _, err := dao.SetUserVendorOrderStatus(txDB, orderInfo.OrderID, temp_vendor_status); err != nil { if _, err := dao.SetUserVendorOrderStatus(txDB, orderInfo.OrderID, temp_vendor_status); err != nil {
dao.Rollback(db, txDB) dao.Rollback(db, txDB)
@@ -216,7 +216,7 @@ func PayByBalance(ctx *jxcontext.Context, orderID string, isChoose, payType int,
return nil, "order/user_vendor_order更新状态出错", nil return nil, "order/user_vendor_order更新状态出错", nil
} }
} else { } else {
//（1）用户选中余额 但余额<订单总价 需混合微信支付 //（2）用户选中余额 但余额<订单总价 需混合微信支付
if userBill.AccountBalance == 0 { if userBill.AccountBalance == 0 {
WxPayParam, err := Pay(ctx, orderInfo.OrderID, payType, vendorPayType, appID, orderInfo.PayPrice) WxPayParam, err := Pay(ctx, orderInfo.OrderID, payType, vendorPayType, appID, orderInfo.PayPrice)
if err != nil { if err != nil {
@@ -237,7 +237,7 @@ func PayByBalance(ctx *jxcontext.Context, orderID string, isChoose, payType int,
} }
} }
if isChoose == model.PayNotChooseBalance { if isChoose == model.PayNotChooseBalance {
//（4）不选中余额支付 即直接微信支付 //（3）不选中余额支付 即直接微信支付
globals.SugarLogger.Debug("进入PayNotChooseBalance==================") globals.SugarLogger.Debug("进入PayNotChooseBalance==================")
WxPayParam, err := Pay(ctx, orderInfo.OrderID, payType, vendorPayType, appID, orderInfo.PayPrice) WxPayParam, err := Pay(ctx, orderInfo.OrderID, payType, vendorPayType, appID, orderInfo.PayPrice)
if err != nil { if err != nil {