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

add

Browse Source
This commit is contained in:
richboo111
2022-07-22 16:32:18 +08:00
parent 4bfb4666cd
commit 09477a093e
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxstore/cms/user2.go
View File

@@ -541,6 +541,7 @@ func InvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree bo
userMembers, err := dao.GetUserMember(db, userIDReal, model.MemberTypeNormal) userMembers, err := dao.GetUserMember(db, userIDReal, model.MemberTypeNormal)
configList, err := dao.QueryConfigs(db, model.ConfigTypeName[model.ConfigTypeMemberCard], model.ConfigTypeMemberCard, "") configList, err := dao.QueryConfigs(db, model.ConfigTypeName[model.ConfigTypeMemberCard], model.ConfigTypeMemberCard, "")
userBill, err := dao.GetUserBill(db, userIDReal, "") userBill, err := dao.GetUserBill(db, userIDReal, "")
if len(configList) <= 0 { if len(configList) <= 0 {
return "", fmt.Errorf("未找到会员卡配置！") return "", fmt.Errorf("未找到会员卡配置！")
} }

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

@@ -273,6 +273,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) {
if err := OnWXPayFinished(order); err != nil { if err := OnWXPayFinished(order); err != nil {
return err return err
} }
return err
} }
//发快递 //发快递
if order.OrderType == 3 { if order.OrderType == 3 {
@@ -305,6 +306,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) {
err = OnPayFinished(order) err = OnPayFinished(order)
} }
} }
return err
} }
} else { } else {

21
business/jxstore/financial/pay.go
View File

@@ -105,29 +105,30 @@ func OnCashFinished(order *model.Order) (err error) {
//微信支付充值会员 //微信支付充值会员
func OnWXPayFinished(order *model.Order) (err error) { func OnWXPayFinished(order *model.Order) (err error) {
var ( var (
db = dao.GetDB() //db = dao.GetDB()
ctx *jxcontext.Context ctx *jxcontext.Context
) )
globals.SugarLogger.Debugf("OnWXPayFinished begin modify account order: %v", utils.Format4Output(order, false)) globals.SugarLogger.Debugf("OnWXPayFinished begin modify account order: %v", utils.Format4Output(order, false))
txDB, _ := dao.Begin(db) //txDB, _ := dao.Begin(db)
defer func() { //defer func() {
if r := recover(); r != nil { // if r := recover(); r != nil {
dao.Rollback(db, txDB) // dao.Rollback(db, txDB)
panic(r) // panic(r)
} // }
}() //}()
//获取用户会员信息 //获取用户会员信息
//userMember, err := dao.GetUserMember(db, order.UserID, model.UserStatusNormal) //userMember, err := dao.GetUserMember(db, order.UserID, model.UserStatusNormal)
//根据订单类型来操作账户 //根据订单类型来操作账户
if order.Type == 1 { if order.Type == 1 {
if _, err = WXInvestMember(ctx, order.OrderType, order.UserID, true); err != nil { if _, err = WXInvestMember(ctx, order.OrderType, order.UserID, true); err != nil {
dao.Rollback(db, txDB) //dao.Rollback(db, txDB)
return err
} }
} else { } else {
globals.SugarLogger.Debugf("OnWXPayFinished 暂不支持此订单类型 order: %v", utils.Format4Output(order, false)) globals.SugarLogger.Debugf("OnWXPayFinished 暂不支持此订单类型 order: %v", utils.Format4Output(order, false))
return fmt.Errorf("暂不支持此订单类型！") return fmt.Errorf("暂不支持此订单类型！")
} }
dao.Commit(db, txDB) //dao.Commit(db, txDB)
globals.SugarLogger.Debugf("OnWXPayFinished end modify account ...") globals.SugarLogger.Debugf("OnWXPayFinished end modify account ...")
return err return err
} }