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-08-04 18:08:55 +08:00
parent 9286e28acc fb90a96f65
commit bc1e059d32
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,23 +195,29 @@ func PayByBalance(ctx *jxcontext.Context, orderID string, isChoose, payType int,
}
}()
//增加账单 余额减去相应金额
//flag := -1
globals.SugarLogger.Debug("增加账单 余额减去相应金额")
money := userBill.AccountBalance - orderInfo.PayPrice
if err = dao.UpdateUserBill(userBill.UserID, money); err != nil {
return nil, "余额支付失败", err
}
//else {
// flag = 1 //支付成功
//}
//更新订单状态
globals.SugarLogger.Debug("更新order状态")
//temp_method := 1
//temp_status := 110
if _, err := dao.SetOrderStatus(txDB, orderInfo.PayPrice, 1, 110, orderID); err != nil {
orderInfo.PayMethod = 1
orderInfo.Status = 110
if _, err := dao.UpdateEntityTx(txDB, orderInfo, "PayMethod"); err != nil {
dao.Rollback(db, txDB)
return nil, "更新order状态失败", err
return nil, "更新order.PayMethod状态失败", err
}
if _, err := dao.UpdateEntityTx(txDB, orderInfo, "Status"); err != nil {
dao.Rollback(db, txDB)
return nil, "更新order.Status状态失败", err
}
//if _, err := dao.SetOrderStatus(txDB, orderInfo.PayPrice, 1, 110, orderID); err != nil {
// dao.Rollback(db, txDB)
// return nil, "更新order状态失败", err
//}
//todo 后续需增加其他订单类型
//(1)更新快递 订单状态
globals.SugarLogger.Debug("更新UserVendorOrder状态")

6
business/jxstore/financial/financial.go
View File

@@ -283,14 +283,20 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) {
}()
globals.SugarLogger.Debug("更新order")
order.TransactionID = call.TrxID
order.Status = 110 //支付成功状态
globals.SugarLogger.Debug("输出赋值后的order.TransactionID", order.TransactionID)
if _, err := dao.UpdateEntityTx(txdb, order, "TransactionID"); err != nil {
dao.Rollback(db, txdb)
return err
}
if _, err := dao.UpdateEntityTx(txdb, order, "Status"); err != nil {
dao.Rollback(db, txdb)
return err
}
//测试order 数据库是否更新成功
order_test, err := dao.GetOrderByID(db, order.OrderID)
globals.SugarLogger.Debug("再次从数据库拿order.TransactionID", order_test.TransactionID)
globals.SugarLogger.Debug("再次从数据库拿order.Status", order_test.Status)
////////////////////////////////////
globals.SugarLogger.Debug("获取UserVendorOrder")