From 76c7faa927fa89edbcc597fce683b9f0d486ca19 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 21 Jul 2022 18:04:54 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=A4=84=E7=90=86=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/financial/financial.go | 67 ++++++++++++++----------- 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/business/jxstore/financial/financial.go b/business/jxstore/financial/financial.go index 09c6928cf..ca90a8eeb 100644 --- a/business/jxstore/financial/financial.go +++ b/business/jxstore/financial/financial.go @@ -263,41 +263,50 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) { if call.TrxStatus == tonglianpayapi.TrxStatusSuccess { order.Status = model.OrderStatusFinished payStatus = model.OrderStatusSuccessPay + } else { order.Status = model.OrderStatusCanceled payStatus = model.OrderStatusFailPay } - - txdb, _ := dao.Begin(db) - defer func() { - if r := recover(); r != nil { - panic(r) - } - }() - if _, err := dao.UpdateEntityTx(txdb, order); err != nil { - dao.Rollback(db, txdb) - return err - } - - userOrder := model.UserVendorOrder{LocalWayBill: order.OrderID} - if err := dao.GetEntity(db, &userOrder, `LocalWayBill`); err != nil { - dao.Rollback(db, txdb) - return err - } - userOrder.OrderStatus = payStatus - if _, err := dao.UpdateEntityTx(txdb, &userOrder, "OrderStatus"); err != nil { - dao.Rollback(db, txdb) - return err - } - dao.Commit(db, txdb) - if call.TrxStatus == tonglianpayapi.TrxStatusSuccess { - switch order.OrderType { - case model.PayType4Express: - err = q_bida.CreateOrder2QBiDa(&userOrder) - case model.PayType4Member, model.PayType4Recharge: - err = OnPayFinished(order) + //充值会员 增加微信支付处理业务 + if order.OrderType == 2 && call.TrxStatus == tonglianpayapi.TrxStatusSuccess { + if err := OnPayFinished(order); err != nil { + return err } } + //发快递 + if order.OrderType == 3 { + txdb, _ := dao.Begin(db) + defer func() { + if r := recover(); r != nil { + panic(r) + } + }() + if _, err := dao.UpdateEntityTx(txdb, order); err != nil { + dao.Rollback(db, txdb) + return err + } + userOrder := model.UserVendorOrder{LocalWayBill: order.OrderID} + if err := dao.GetEntity(db, &userOrder, `LocalWayBill`); err != nil { + dao.Rollback(db, txdb) + return err + } + userOrder.OrderStatus = payStatus + if _, err := dao.UpdateEntityTx(txdb, &userOrder, "OrderStatus"); err != nil { + dao.Rollback(db, txdb) + return err + } + dao.Commit(db, txdb) + if call.TrxStatus == tonglianpayapi.TrxStatusSuccess { + switch order.OrderType { + case model.PayType4Express: + err = q_bida.CreateOrder2QBiDa(&userOrder) + case model.PayType4Member, model.PayType4Recharge: + err = OnPayFinished(order) + } + } + } + } else { globals.SugarLogger.Debugf("onTLpayFinished msg:%s, err:%v", utils.Format4Output(call, true), err) } From eba9e2c25089e4196b94c5d8148f5f41ea35bc11 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 22 Jul 2022 11:32:15 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=85=85=E5=80=BC=E4=BC=9A=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/financial/financial.go | 2 +- business/jxstore/financial/pay.go | 40 ++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/business/jxstore/financial/financial.go b/business/jxstore/financial/financial.go index ca90a8eeb..efa068399 100644 --- a/business/jxstore/financial/financial.go +++ b/business/jxstore/financial/financial.go @@ -270,7 +270,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) { } //充值会员 增加微信支付处理业务 if order.OrderType == 2 && call.TrxStatus == tonglianpayapi.TrxStatusSuccess { - if err := OnPayFinished(order); err != nil { + if err := OnWXPayFinished(order); err != nil { return err } } diff --git a/business/jxstore/financial/pay.go b/business/jxstore/financial/pay.go index 293446343..1584983aa 100644 --- a/business/jxstore/financial/pay.go +++ b/business/jxstore/financial/pay.go @@ -2,10 +2,10 @@ package financial import ( "fmt" - "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/globals" + "git.rosy.net.cn/jx-callback/business/jxstore/cms" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" @@ -102,3 +102,41 @@ func OnCashFinished(order *model.Order) (err error) { globals.SugarLogger.Debugf("OnCashFinished end modify account ...") return err } + +//微信支付充值会员 +func OnWXPayFinished(order *model.Order) (err error) { + var ( + db = dao.GetDB() + ctx *jxcontext.Context + ) + globals.SugarLogger.Debugf("OnWXPayFinished begin modify account order: %v", utils.Format4Output(order, false)) + txDB, _ := dao.Begin(db) + defer func() { + if r := recover(); r != nil { + dao.Rollback(db, txDB) + panic(r) + } + }() + //如果用户没有对应账单信息就给他生成一条 + userBill, err := dao.GetUserBill(db, order.UserID, "") + if userBill == nil { + globals.SugarLogger.Debugf("OnPayFinished 未找到该用户的账单 order: %v", utils.Format4Output(order, false)) + return fmt.Errorf("未找到该用户的账单！%v", order.UserID) + } + //获取用户会员信息 + userMember, err := dao.GetUserMember(db, order.UserID, model.UserStatusNormal) + //根据订单类型来操作账户 + switch order.Type { + case model.OrderTpyeMember: + //微信支付充值会员 + if _, err = cms.InvestMember(ctx, userMember[0].MemberType, order.UserID, true); err != nil { + dao.Rollback(db, txDB) + } + default: + globals.SugarLogger.Debugf("OnPayFinished 暂不支持此订单类型 order: %v", utils.Format4Output(order, false)) + return fmt.Errorf("暂不支持此订单类型！") + } + dao.Commit(db, txDB) + globals.SugarLogger.Debugf("OnWXPayFinished end modify account ...") + return err +} From 92dffeba1d8f46322303a870568368bd7f7ec036 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 22 Jul 2022 11:46:41 +0800 Subject: [PATCH 03/11] add --- business/jxstore/financial/bill.go | 87 ++++++++++++++++++++++++++++++ business/jxstore/financial/pay.go | 3 +- 2 files changed, 88 insertions(+), 2 deletions(-) diff --git a/business/jxstore/financial/bill.go b/business/jxstore/financial/bill.go index e5ef71dad..17b479047 100644 --- a/business/jxstore/financial/bill.go +++ b/business/jxstore/financial/bill.go @@ -1,7 +1,9 @@ package financial import ( + "fmt" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/auth2" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" @@ -165,3 +167,88 @@ func SettleUnionOrders(ctx *jxcontext.Context, vendorIDs []int) (err error) { dao.Commit(db, txDB) return err } + +func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree bool) (errCode string, err error) { + var ( + db = dao.GetDB() + memberCards []*model.MemberCard + memberCard *model.MemberCard + userIDReal string + ) + if !isFree { + userIDReal = ctx.GetUserID() + } else { + userIDReal = userID + } + userMembers, err := dao.GetUserMember(db, userIDReal, model.MemberTypeNormal) + configList, err := dao.QueryConfigs(db, model.ConfigTypeName[model.ConfigTypeMemberCard], model.ConfigTypeMemberCard, "") + userBill, err := dao.GetUserBill(db, userIDReal, "") + if len(configList) <= 0 { + return "", fmt.Errorf("未找到会员卡配置！") + } + config := configList[0] + err = jxutils.Strings2Objs(config.Value, &memberCards) + if err != nil { + return "", err + } + for _, v := range memberCards { + if v.ID == memberID { + memberCard = v + } + } + if !isFree { + //验证微信绑定 + if err = auth2.CheckWeixinminiAuthBind(userIDReal); err != nil { + return "", err + } + if userBill.AccountBalance < memberCard.ActPrice { + return model.ErrCodeAccountBalanceNotEnough, fmt.Errorf("用户余额不足，请充值！") + } + } + txDB, _ := dao.Begin(db) + defer func() { + if r := recover(); r != nil { + dao.Rollback(db, txDB) + panic(r) + } + }() + //证明已经开了会员了，相当于续费 + if len(userMembers) > 0 { + userMember := userMembers[0] + if memberID == model.MemberCardTypeMonth { + userMember.EndAt = userMember.EndAt.AddDate(0, 1, 0) + } else { + userMember.EndAt = userMember.EndAt.AddDate(1, 0, 0) + } + if _, err = dao.UpdateEntity(db, userMember, "EndAt"); err != nil { + dao.Rollback(db, txDB) + return + } + } else { + userMember2 := &model.UserMember{ + UserID: userIDReal, + MemberType: model.MemberTypeNormal, + MemberTypeID: memberID, + } + if memberID == model.MemberCardTypeMonth { + userMember2.EndAt = time.Now().AddDate(0, 1, 0) + } else { + userMember2.EndAt = time.Now().AddDate(1, 0, 0) + } + dao.WrapAddIDCULDEntity(userMember2, ctx.GetUserName()) + if err = dao.CreateEntity(db, userMember2); err != nil { + dao.Rollback(db, txDB) + return + } + } + if !isFree { + + //支出明细 + if err = AddExpendUpdateAccount(txDB, userBill, model.BillTypeMember, memberCard.ActPrice, 0); err != nil { + dao.Rollback(db, txDB) + return + } + } + dao.Commit(db, txDB) + return errCode, err +} diff --git a/business/jxstore/financial/pay.go b/business/jxstore/financial/pay.go index 1584983aa..a463d936c 100644 --- a/business/jxstore/financial/pay.go +++ b/business/jxstore/financial/pay.go @@ -5,7 +5,6 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/globals" - "git.rosy.net.cn/jx-callback/business/jxstore/cms" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" @@ -129,7 +128,7 @@ func OnWXPayFinished(order *model.Order) (err error) { switch order.Type { case model.OrderTpyeMember: //微信支付充值会员 - if _, err = cms.InvestMember(ctx, userMember[0].MemberType, order.UserID, true); err != nil { + if _, err = WXInvestMember(ctx, userMember[0].MemberType, order.UserID, true); err != nil { dao.Rollback(db, txDB) } default: From ed5deec4f4129656b236298320fc45549e9e10e9 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 22 Jul 2022 14:05:15 +0800 Subject: [PATCH 04/11] add --- business/jxstore/financial/bill.go | 53 +++---------------------- business/jxstore/financial/bill_test.go | 15 +++++++ business/jxstore/financial/pay.go | 8 +--- 3 files changed, 21 insertions(+), 55 deletions(-) create mode 100644 business/jxstore/financial/bill_test.go diff --git a/business/jxstore/financial/bill.go b/business/jxstore/financial/bill.go index 17b479047..efd7eaa82 100644 --- a/business/jxstore/financial/bill.go +++ b/business/jxstore/financial/bill.go @@ -1,9 +1,8 @@ package financial import ( - "fmt" + _ "fmt" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/auth2" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" @@ -169,42 +168,8 @@ func SettleUnionOrders(ctx *jxcontext.Context, vendorIDs []int) (err error) { } func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree bool) (errCode string, err error) { - var ( - db = dao.GetDB() - memberCards []*model.MemberCard - memberCard *model.MemberCard - userIDReal string - ) - if !isFree { - userIDReal = ctx.GetUserID() - } else { - userIDReal = userID - } - userMembers, err := dao.GetUserMember(db, userIDReal, model.MemberTypeNormal) - configList, err := dao.QueryConfigs(db, model.ConfigTypeName[model.ConfigTypeMemberCard], model.ConfigTypeMemberCard, "") - userBill, err := dao.GetUserBill(db, userIDReal, "") - if len(configList) <= 0 { - return "", fmt.Errorf("未找到会员卡配置！") - } - config := configList[0] - err = jxutils.Strings2Objs(config.Value, &memberCards) - if err != nil { - return "", err - } - for _, v := range memberCards { - if v.ID == memberID { - memberCard = v - } - } - if !isFree { - //验证微信绑定 - if err = auth2.CheckWeixinminiAuthBind(userIDReal); err != nil { - return "", err - } - if userBill.AccountBalance < memberCard.ActPrice { - return model.ErrCodeAccountBalanceNotEnough, fmt.Errorf("用户余额不足，请充值！") - } - } + var db = dao.GetDB() + userMembers, err := dao.GetUserMember(db, userID, model.MemberTypeNormal) txDB, _ := dao.Begin(db) defer func() { if r := recover(); r != nil { @@ -212,7 +177,7 @@ func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree panic(r) } }() - //证明已经开了会员了，相当于续费 + //当前状态是否是会员 续费/开通 if len(userMembers) > 0 { userMember := userMembers[0] if memberID == model.MemberCardTypeMonth { @@ -226,7 +191,7 @@ func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree } } else { userMember2 := &model.UserMember{ - UserID: userIDReal, + UserID: userID, MemberType: model.MemberTypeNormal, MemberTypeID: memberID, } @@ -241,14 +206,6 @@ func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree return } } - if !isFree { - - //支出明细 - if err = AddExpendUpdateAccount(txDB, userBill, model.BillTypeMember, memberCard.ActPrice, 0); err != nil { - dao.Rollback(db, txDB) - return - } - } dao.Commit(db, txDB) return errCode, err } diff --git a/business/jxstore/financial/bill_test.go b/business/jxstore/financial/bill_test.go new file mode 100644 index 000000000..cefde1fb5 --- /dev/null +++ b/business/jxstore/financial/bill_test.go @@ -0,0 +1,15 @@ +package financial + +import ( + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" + "testing" +) + +func TestOnWXPayFinished(t *testing.T) { + var ( + ctx *jxcontext.Context + ) + if _, err := WXInvestMember(ctx, 1, "1303D7B2096011ED9A4C525400C36BDA", true); err != nil { + t.Logf("微信购买会员失败") + } +} diff --git a/business/jxstore/financial/pay.go b/business/jxstore/financial/pay.go index a463d936c..f26f6444e 100644 --- a/business/jxstore/financial/pay.go +++ b/business/jxstore/financial/pay.go @@ -116,12 +116,6 @@ func OnWXPayFinished(order *model.Order) (err error) { panic(r) } }() - //如果用户没有对应账单信息就给他生成一条 - userBill, err := dao.GetUserBill(db, order.UserID, "") - if userBill == nil { - globals.SugarLogger.Debugf("OnPayFinished 未找到该用户的账单 order: %v", utils.Format4Output(order, false)) - return fmt.Errorf("未找到该用户的账单！%v", order.UserID) - } //获取用户会员信息 userMember, err := dao.GetUserMember(db, order.UserID, model.UserStatusNormal) //根据订单类型来操作账户 @@ -132,7 +126,7 @@ func OnWXPayFinished(order *model.Order) (err error) { dao.Rollback(db, txDB) } default: - globals.SugarLogger.Debugf("OnPayFinished 暂不支持此订单类型 order: %v", utils.Format4Output(order, false)) + globals.SugarLogger.Debugf("OnWXPayFinished 暂不支持此订单类型 order: %v", utils.Format4Output(order, false)) return fmt.Errorf("暂不支持此订单类型！") } dao.Commit(db, txDB) From 0012b7ed4f38093a03ab9d16b46a2482aa260a83 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 22 Jul 2022 14:36:43 +0800 Subject: [PATCH 05/11] add --- business/jxstore/financial/bill.go | 3 +++ business/jxstore/financial/pay.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/business/jxstore/financial/bill.go b/business/jxstore/financial/bill.go index efd7eaa82..c1aea50c5 100644 --- a/business/jxstore/financial/bill.go +++ b/business/jxstore/financial/bill.go @@ -169,7 +169,10 @@ func SettleUnionOrders(ctx *jxcontext.Context, vendorIDs []int) (err error) { func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree bool) (errCode string, err error) { var db = dao.GetDB() + //获取用户当前用户信息 userMembers, err := dao.GetUserMember(db, userID, model.MemberTypeNormal) + //获取用户微信下单信息 + //userBill, err := dao.GetUserBill(db, userID, "") txDB, _ := dao.Begin(db) defer func() { if r := recover(); r != nil { diff --git a/business/jxstore/financial/pay.go b/business/jxstore/financial/pay.go index f26f6444e..11517adaa 100644 --- a/business/jxstore/financial/pay.go +++ b/business/jxstore/financial/pay.go @@ -122,7 +122,7 @@ func OnWXPayFinished(order *model.Order) (err error) { switch order.Type { case model.OrderTpyeMember: //微信支付充值会员 - if _, err = WXInvestMember(ctx, userMember[0].MemberType, order.UserID, true); err != nil { + if _, err = WXInvestMember(ctx, userMember[0].MemberTypeID, order.UserID, true); err != nil { dao.Rollback(db, txDB) } default: From 4bfb4666cdac1ff9830dae91926dd390cb2fed40 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 22 Jul 2022 16:05:03 +0800 Subject: [PATCH 06/11] add --- business/jxstore/financial/bill.go | 2 +- business/jxstore/financial/financial.go | 2 +- business/jxstore/financial/pay.go | 10 ++++------ business/model/order.go | 7 ++++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/business/jxstore/financial/bill.go b/business/jxstore/financial/bill.go index c1aea50c5..bb4d96d3b 100644 --- a/business/jxstore/financial/bill.go +++ b/business/jxstore/financial/bill.go @@ -169,7 +169,7 @@ func SettleUnionOrders(ctx *jxcontext.Context, vendorIDs []int) (err error) { func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree bool) (errCode string, err error) { var db = dao.GetDB() - //获取用户当前用户信息 + //获取用户 当前会员信息 userMembers, err := dao.GetUserMember(db, userID, model.MemberTypeNormal) //获取用户微信下单信息 //userBill, err := dao.GetUserBill(db, userID, "") diff --git a/business/jxstore/financial/financial.go b/business/jxstore/financial/financial.go index efa068399..87c7ae487 100644 --- a/business/jxstore/financial/financial.go +++ b/business/jxstore/financial/financial.go @@ -269,7 +269,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) { payStatus = model.OrderStatusFailPay } //充值会员 增加微信支付处理业务 - if order.OrderType == 2 && call.TrxStatus == tonglianpayapi.TrxStatusSuccess { + if (order.OrderType == 2 || order.OrderType == 5) && call.TrxStatus == tonglianpayapi.TrxStatusSuccess { if err := OnWXPayFinished(order); err != nil { return err } diff --git a/business/jxstore/financial/pay.go b/business/jxstore/financial/pay.go index 11517adaa..8695d6f40 100644 --- a/business/jxstore/financial/pay.go +++ b/business/jxstore/financial/pay.go @@ -117,15 +117,13 @@ func OnWXPayFinished(order *model.Order) (err error) { } }() //获取用户会员信息 - userMember, err := dao.GetUserMember(db, order.UserID, model.UserStatusNormal) + //userMember, err := dao.GetUserMember(db, order.UserID, model.UserStatusNormal) //根据订单类型来操作账户 - switch order.Type { - case model.OrderTpyeMember: - //微信支付充值会员 - if _, err = WXInvestMember(ctx, userMember[0].MemberTypeID, order.UserID, true); err != nil { + if order.Type == 1 { + if _, err = WXInvestMember(ctx, order.OrderType, order.UserID, true); err != nil { dao.Rollback(db, txDB) } - default: + } else { globals.SugarLogger.Debugf("OnWXPayFinished 暂不支持此订单类型 order: %v", utils.Format4Output(order, false)) return fmt.Errorf("暂不支持此订单类型！") } diff --git a/business/model/order.go b/business/model/order.go index c8e80a8ec..9a74fb473 100644 --- a/business/model/order.go +++ b/business/model/order.go @@ -30,9 +30,10 @@ const ( OrderTypeCash = 2 //提现 OrderTypePublishJob = 1 //发布任务 - OrderTpyeMember = 2 //充值会员 + OrderTypeMember = 2 //充值会员月卡 + OrderTypeMemberYear = 5 //充值会员年卡 OrderTypeDelivery = 3 //发快递 - OrderTpyeDropShipping = 4 //一件代发交钱 + OrderTypeDropShipping = 4 //一件代发交钱 ) var ( @@ -58,7 +59,7 @@ type Order struct { OrderID string `orm:"column(order_id)" json:"orderID"` // 订单号 UserID string `orm:"column(user_id);size(48)" json:"userID"` // 用户ID Type int `json:"type"` // 支付还是提现 1-支付，2-提现 - OrderType int `json:"orderType"` // 订单类型，1-发任务，2-冲会员，3-发快递，4-提现 + OrderType int `json:"orderType"` // 订单类型，1-发任务，2-会员月卡，3-发快递，4-提现，5-会员年卡 Way string `json:"way"` // weixinapp ,weixinmini Status int `json:"status"` // 订单状态,待支付2，已支付5，支付成功110，支付失败115,150取消 PayPrice int `json:"payPrice"` // 支付金额 From 09477a093ebad6c594e9247b9c0863d576608a09 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 22 Jul 2022 16:32:18 +0800 Subject: [PATCH 07/11] add --- business/jxstore/cms/user2.go | 1 + business/jxstore/financial/financial.go | 2 ++ business/jxstore/financial/pay.go | 21 +++++++++++---------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go index 2d8afa446..aed58e059 100644 --- a/business/jxstore/cms/user2.go +++ b/business/jxstore/cms/user2.go @@ -541,6 +541,7 @@ func InvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree bo userMembers, err := dao.GetUserMember(db, userIDReal, model.MemberTypeNormal) configList, err := dao.QueryConfigs(db, model.ConfigTypeName[model.ConfigTypeMemberCard], model.ConfigTypeMemberCard, "") userBill, err := dao.GetUserBill(db, userIDReal, "") + if len(configList) <= 0 { return "", fmt.Errorf("未找到会员卡配置！") } diff --git a/business/jxstore/financial/financial.go b/business/jxstore/financial/financial.go index 87c7ae487..ce0c6cf08 100644 --- a/business/jxstore/financial/financial.go +++ b/business/jxstore/financial/financial.go @@ -273,6 +273,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) { if err := OnWXPayFinished(order); err != nil { return err } + return err } //发快递 if order.OrderType == 3 { @@ -305,6 +306,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) { err = OnPayFinished(order) } } + return err } } else { diff --git a/business/jxstore/financial/pay.go b/business/jxstore/financial/pay.go index 8695d6f40..ac1278520 100644 --- a/business/jxstore/financial/pay.go +++ b/business/jxstore/financial/pay.go @@ -105,29 +105,30 @@ func OnCashFinished(order *model.Order) (err error) { //微信支付充值会员 func OnWXPayFinished(order *model.Order) (err error) { var ( - db = dao.GetDB() + //db = dao.GetDB() ctx *jxcontext.Context ) globals.SugarLogger.Debugf("OnWXPayFinished begin modify account order: %v", utils.Format4Output(order, false)) - txDB, _ := dao.Begin(db) - defer func() { - if r := recover(); r != nil { - dao.Rollback(db, txDB) - panic(r) - } - }() + //txDB, _ := dao.Begin(db) + //defer func() { + // if r := recover(); r != nil { + // dao.Rollback(db, txDB) + // panic(r) + // } + //}() //获取用户会员信息 //userMember, err := dao.GetUserMember(db, order.UserID, model.UserStatusNormal) //根据订单类型来操作账户 if order.Type == 1 { if _, err = WXInvestMember(ctx, order.OrderType, order.UserID, true); err != nil { - dao.Rollback(db, txDB) + //dao.Rollback(db, txDB) + return err } } else { globals.SugarLogger.Debugf("OnWXPayFinished 暂不支持此订单类型 order: %v", utils.Format4Output(order, false)) return fmt.Errorf("暂不支持此订单类型！") } - dao.Commit(db, txDB) + //dao.Commit(db, txDB) globals.SugarLogger.Debugf("OnWXPayFinished end modify account ...") return err } From 6cc34d2a6d9703aba354ae20164cbb4111f26b5e Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 22 Jul 2022 16:45:44 +0800 Subject: [PATCH 08/11] add --- business/jxstore/financial/bill.go | 35 ++++++++++++++++-------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/business/jxstore/financial/bill.go b/business/jxstore/financial/bill.go index bb4d96d3b..e708c8e3a 100644 --- a/business/jxstore/financial/bill.go +++ b/business/jxstore/financial/bill.go @@ -171,25 +171,28 @@ func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree var db = dao.GetDB() //获取用户 当前会员信息 userMembers, err := dao.GetUserMember(db, userID, model.MemberTypeNormal) + if err != nil { + return "获取用户会员信息失败", err + } //获取用户微信下单信息 //userBill, err := dao.GetUserBill(db, userID, "") - txDB, _ := dao.Begin(db) - defer func() { - if r := recover(); r != nil { - dao.Rollback(db, txDB) - panic(r) - } - }() + //txDB, _ := dao.Begin(db) + //defer func() { + // if r := recover(); r != nil { + // dao.Rollback(db, txDB) + // panic(r) + // } + //}() //当前状态是否是会员 续费/开通 if len(userMembers) > 0 { userMember := userMembers[0] - if memberID == model.MemberCardTypeMonth { + if memberID == 2 { userMember.EndAt = userMember.EndAt.AddDate(0, 1, 0) } else { userMember.EndAt = userMember.EndAt.AddDate(1, 0, 0) } if _, err = dao.UpdateEntity(db, userMember, "EndAt"); err != nil { - dao.Rollback(db, txDB) + //dao.Rollback(db, txDB) return } } else { @@ -198,17 +201,17 @@ func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree MemberType: model.MemberTypeNormal, MemberTypeID: memberID, } - if memberID == model.MemberCardTypeMonth { + if memberID == 2 { userMember2.EndAt = time.Now().AddDate(0, 1, 0) } else { userMember2.EndAt = time.Now().AddDate(1, 0, 0) } - dao.WrapAddIDCULDEntity(userMember2, ctx.GetUserName()) - if err = dao.CreateEntity(db, userMember2); err != nil { - dao.Rollback(db, txDB) - return - } + //dao.WrapAddIDCULDEntity(userMember2, ctx.GetUserName()) + //if err = dao.CreateEntity(db, userMember2); err != nil { + // //dao.Rollback(db, txDB) + // return + //} } - dao.Commit(db, txDB) + //dao.Commit(db, txDB) return errCode, err } From d546e5a8803827a562325b9ac67251f4016df03e Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 22 Jul 2022 17:11:48 +0800 Subject: [PATCH 09/11] add --- business/jxstore/financial/bill.go | 28 +++++++------------------ business/jxstore/financial/financial.go | 6 +----- business/jxstore/financial/pay.go | 16 ++------------ 3 files changed, 11 insertions(+), 39 deletions(-) diff --git a/business/jxstore/financial/bill.go b/business/jxstore/financial/bill.go index e708c8e3a..a8ec5a73d 100644 --- a/business/jxstore/financial/bill.go +++ b/business/jxstore/financial/bill.go @@ -167,33 +167,23 @@ func SettleUnionOrders(ctx *jxcontext.Context, vendorIDs []int) (err error) { return err } -func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree bool) (errCode string, err error) { +func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string) (errCode string, err error) { var db = dao.GetDB() //获取用户 当前会员信息 userMembers, err := dao.GetUserMember(db, userID, model.MemberTypeNormal) if err != nil { return "获取用户会员信息失败", err } - //获取用户微信下单信息 - //userBill, err := dao.GetUserBill(db, userID, "") - //txDB, _ := dao.Begin(db) - //defer func() { - // if r := recover(); r != nil { - // dao.Rollback(db, txDB) - // panic(r) - // } - //}() //当前状态是否是会员 续费/开通 if len(userMembers) > 0 { userMember := userMembers[0] - if memberID == 2 { + if memberID == model.OrderTypeMember { userMember.EndAt = userMember.EndAt.AddDate(0, 1, 0) } else { userMember.EndAt = userMember.EndAt.AddDate(1, 0, 0) } if _, err = dao.UpdateEntity(db, userMember, "EndAt"); err != nil { - //dao.Rollback(db, txDB) - return + return "更新会员到期时间失败", err } } else { userMember2 := &model.UserMember{ @@ -201,17 +191,15 @@ func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree MemberType: model.MemberTypeNormal, MemberTypeID: memberID, } - if memberID == 2 { + if memberID == model.OrderTypeMember { userMember2.EndAt = time.Now().AddDate(0, 1, 0) } else { userMember2.EndAt = time.Now().AddDate(1, 0, 0) } - //dao.WrapAddIDCULDEntity(userMember2, ctx.GetUserName()) - //if err = dao.CreateEntity(db, userMember2); err != nil { - // //dao.Rollback(db, txDB) - // return - //} + dao.WrapAddIDCULDEntity(userMember2, ctx.GetUserName()) + if err = dao.CreateEntity(db, userMember2); err != nil { + return "开通会员失败", err + } } - //dao.Commit(db, txDB) return errCode, err } diff --git a/business/jxstore/financial/financial.go b/business/jxstore/financial/financial.go index ce0c6cf08..5c587d4b2 100644 --- a/business/jxstore/financial/financial.go +++ b/business/jxstore/financial/financial.go @@ -263,7 +263,6 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) { if call.TrxStatus == tonglianpayapi.TrxStatusSuccess { order.Status = model.OrderStatusFinished payStatus = model.OrderStatusSuccessPay - } else { order.Status = model.OrderStatusCanceled payStatus = model.OrderStatusFailPay @@ -274,9 +273,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) { return err } return err - } - //发快递 - if order.OrderType == 3 { + } else if order.OrderType == 3 { txdb, _ := dao.Begin(db) defer func() { if r := recover(); r != nil { @@ -308,7 +305,6 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) { } return err } - } else { globals.SugarLogger.Debugf("onTLpayFinished msg:%s, err:%v", utils.Format4Output(call, true), err) } diff --git a/business/jxstore/financial/pay.go b/business/jxstore/financial/pay.go index ac1278520..f4c50e1fe 100644 --- a/business/jxstore/financial/pay.go +++ b/business/jxstore/financial/pay.go @@ -105,30 +105,18 @@ func OnCashFinished(order *model.Order) (err error) { //微信支付充值会员 func OnWXPayFinished(order *model.Order) (err error) { var ( - //db = dao.GetDB() ctx *jxcontext.Context ) globals.SugarLogger.Debugf("OnWXPayFinished begin modify account order: %v", utils.Format4Output(order, false)) - //txDB, _ := dao.Begin(db) - //defer func() { - // if r := recover(); r != nil { - // dao.Rollback(db, txDB) - // panic(r) - // } - //}() - //获取用户会员信息 - //userMember, err := dao.GetUserMember(db, order.UserID, model.UserStatusNormal) //根据订单类型来操作账户 - if order.Type == 1 { - if _, err = WXInvestMember(ctx, order.OrderType, order.UserID, true); err != nil { - //dao.Rollback(db, txDB) + if order.Type == model.OrderTypePay { + if _, err = WXInvestMember(ctx, order.OrderType, order.UserID); err != nil { return err } } else { globals.SugarLogger.Debugf("OnWXPayFinished 暂不支持此订单类型 order: %v", utils.Format4Output(order, false)) return fmt.Errorf("暂不支持此订单类型！") } - //dao.Commit(db, txDB) globals.SugarLogger.Debugf("OnWXPayFinished end modify account ...") return err } From 54d726f00668dd5d30bc759dea8ddd3130ca0954 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 22 Jul 2022 17:33:27 +0800 Subject: [PATCH 10/11] cnt --- business/jxstore/financial/bill.go | 4 ++++ business/jxstore/financial/bill_test.go | 13 ++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/business/jxstore/financial/bill.go b/business/jxstore/financial/bill.go index a8ec5a73d..4d026cffd 100644 --- a/business/jxstore/financial/bill.go +++ b/business/jxstore/financial/bill.go @@ -7,6 +7,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" + "git.rosy.net.cn/jx-print/globals" "github.com/astaxie/beego/client/orm" "time" ) @@ -175,10 +176,12 @@ func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string) (errCod return "获取用户会员信息失败", err } //当前状态是否是会员 续费/开通 + var cnt = 0 if len(userMembers) > 0 { userMember := userMembers[0] if memberID == model.OrderTypeMember { userMember.EndAt = userMember.EndAt.AddDate(0, 1, 0) + cnt++ } else { userMember.EndAt = userMember.EndAt.AddDate(1, 0, 0) } @@ -201,5 +204,6 @@ func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string) (errCod return "开通会员失败", err } } + globals.SugarLogger.Debugf("==================== %d", cnt) return errCode, err } diff --git a/business/jxstore/financial/bill_test.go b/business/jxstore/financial/bill_test.go index cefde1fb5..1b732bcb7 100644 --- a/business/jxstore/financial/bill_test.go +++ b/business/jxstore/financial/bill_test.go @@ -1,15 +1,14 @@ package financial import ( - "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "testing" ) func TestOnWXPayFinished(t *testing.T) { - var ( - ctx *jxcontext.Context - ) - if _, err := WXInvestMember(ctx, 1, "1303D7B2096011ED9A4C525400C36BDA", true); err != nil { - t.Logf("微信购买会员失败") - } + //var ( + // ctx *jxcontext.Context + //) + //if _, err := WXInvestMember(ctx, 1, "1303D7B2096011ED9A4C525400C36BDA", true); err != nil { + // t.Logf("微信购买会员失败") + //} } From 11f4ae814040e092c601df0f3b0c4333a3b05634 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 22 Jul 2022 17:54:40 +0800 Subject: [PATCH 11/11] count --- business/jxstore/financial/financial.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/business/jxstore/financial/financial.go b/business/jxstore/financial/financial.go index 5c587d4b2..454744be9 100644 --- a/business/jxstore/financial/financial.go +++ b/business/jxstore/financial/financial.go @@ -245,6 +245,7 @@ func OnTLPayCallback(call *tonglianpayapi.CallBackResult) (err error) { } func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) { + var count = 0 order := &model.Order{ OrderID: call.CusorderID, } @@ -267,11 +268,13 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) { order.Status = model.OrderStatusCanceled payStatus = model.OrderStatusFailPay } + //充值会员 增加微信支付处理业务 if (order.OrderType == 2 || order.OrderType == 5) && call.TrxStatus == tonglianpayapi.TrxStatusSuccess { if err := OnWXPayFinished(order); err != nil { return err } + count++ return err } else if order.OrderType == 3 { txdb, _ := dao.Begin(db) @@ -308,6 +311,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) { } else { globals.SugarLogger.Debugf("onTLpayFinished msg:%s, err:%v", utils.Format4Output(call, true), err) } + globals.SugarLogger.Debugf("=============aaaaaaaaa========== %d", count) return err }