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

修改获取快递订单详情验证

Browse Source
This commit is contained in:
richboo111
2022-07-26 18:14:26 +08:00
parent d0b242e2ea
commit 4ff61f9a39
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,7 +124,7 @@ var (
) )
//余额支付 微信补差值 //余额支付 微信补差值
func PayByBalance(ctx *jxcontext.Context, orderID string, payType, restPrice int, appID, vendorPayType string) (errMsg string, err error) { func PayByBalance(ctx *jxcontext.Context, orderID string, restPrice, payType int, vendorPayType, appID string) (errMsg string, err error) {
var ( var (
db = dao.GetDB() db = dao.GetDB()
) )
@@ -146,7 +146,7 @@ func PayByBalance(ctx *jxcontext.Context, orderID string, payType, restPrice int
} }
}() }()
if orderInfo.Status == NotPay { if orderInfo.Status == NotPay {
if userBill.AccountBalance > 0 { if userBill.AccountBalance > 0 && restPrice == 0 {
//余额 全款支付 //余额 全款支付
if userBill.AccountBalance > orderInfo.PayPrice && userBill.AccountBalance-orderInfo.PayPrice > 0 { if userBill.AccountBalance > orderInfo.PayPrice && userBill.AccountBalance-orderInfo.PayPrice > 0 {
if err = financial.AddExpendUpdateAccount(txDB, userBill, model.BillTypePayByAccountBalance, orderInfo.PayPrice, 0); err != nil { if err = financial.AddExpendUpdateAccount(txDB, userBill, model.BillTypePayByAccountBalance, orderInfo.PayPrice, 0); err != nil {

1
business/model/dao/dao.go
View File

@@ -206,7 +206,6 @@ func CreateEntity(db *DaoDB, item interface{}) (err error) {
if db == nil { if db == nil {
db = GetDB() db = GetDB()
} }
globals.SugarLogger.Errorf("==========================进入创建新用户阶段")
if _, err = db.Db.Insert(item); err != nil && !IsDuplicateError(err) { if _, err = db.Db.Insert(item); err != nil && !IsDuplicateError(err) {
globals.SugarLogger.Errorf("CreateEntity %s failed with error:%v", reflect.TypeOf(item).Name(), err) globals.SugarLogger.Errorf("CreateEntity %s failed with error:%v", reflect.TypeOf(item).Name(), err)
} }