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

Merge branch 'rsm' of e.coding.net:rosydev/jx-callback into rsm

Browse Source
This commit is contained in:
邹宗楠
2022-07-28 14:32:25 +08:00
parent 10653b50c5 c5e0474fd6
commit 0a435db932
1 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,12 +161,15 @@ func PayByBalance(ctx *jxcontext.Context, orderID string, restPrice, payType int
} }
orderInfo.Status = AlreadyPay orderInfo.Status = AlreadyPay
} }
}
if restPrice != 0 { if restPrice != 0 {
//需支付部分 //需支付部分
//restPrice := orderInfo.PayPrice - userBill.AccountBalance //restPrice := orderInfo.PayPrice - userBill.AccountBalance
globals.SugarLogger.Debug("进入混合支付部分") globals.SugarLogger.Debug("进入混合支付部分")
orderInfo.PayPrice = restPrice orderInfo.PayPrice = restPrice
globals.SugarLogger.Debug("orderInfo.PayPrice=================", orderInfo.PayPrice)
_, err := Pay(ctx, orderInfo.OrderID, payType, vendorPayType, appID) _, err := Pay(ctx, orderInfo.OrderID, payType, vendorPayType, appID)
globals.SugarLogger.Debug("err=================", err)
if err != nil { if err != nil {
return "微信支付失败：", err return "微信支付失败：", err
} }
@@ -185,7 +188,7 @@ func PayByBalance(ctx *jxcontext.Context, orderID string, restPrice, payType int
} }
return "混合支付成功", err return "混合支付成功", err
} }
}
dao.Commit(db, txDB) dao.Commit(db, txDB)
} }
return "", err return "", err