diff --git a/business/jxstore/financial/financial.go b/business/jxstore/financial/financial.go index 454744be9..5d81f52bf 100644 --- a/business/jxstore/financial/financial.go +++ b/business/jxstore/financial/financial.go @@ -245,7 +245,6 @@ func OnTLPayCallback(call *tonglianpayapi.CallBackResult) (err error) { } func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) { - var count = 0 order := &model.Order{ OrderID: call.CusorderID, } @@ -271,11 +270,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) { //充值会员 增加微信支付处理业务 if (order.OrderType == 2 || order.OrderType == 5) && call.TrxStatus == tonglianpayapi.TrxStatusSuccess { - if err := OnWXPayFinished(order); err != nil { - return err - } - count++ - return err + return OnWXPayFinished(order) } else if order.OrderType == 3 { txdb, _ := dao.Begin(db) defer func() { @@ -311,7 +306,6 @@ 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 } diff --git a/business/jxstore/financial/pay.go b/business/jxstore/financial/pay.go index f4c50e1fe..286785926 100644 --- a/business/jxstore/financial/pay.go +++ b/business/jxstore/financial/pay.go @@ -110,13 +110,11 @@ func OnWXPayFinished(order *model.Order) (err error) { globals.SugarLogger.Debugf("OnWXPayFinished begin modify account order: %v", utils.Format4Output(order, false)) //根据订单类型来操作账户 if order.Type == model.OrderTypePay { - if _, err = WXInvestMember(ctx, order.OrderType, order.UserID); err != nil { - return err - } + _, err = WXInvestMember(ctx, order.OrderType, order.UserID) } else { globals.SugarLogger.Debugf("OnWXPayFinished 暂不支持此订单类型 order: %v", utils.Format4Output(order, false)) return fmt.Errorf("暂不支持此订单类型!") } - globals.SugarLogger.Debugf("OnWXPayFinished end modify account ...") + globals.SugarLogger.Debug("OnWXPayFinished end modify account ...", err) return err } diff --git a/controllers/tonglian_callback.go b/controllers/tonglian_callback.go index e9bfa2434..e34461869 100644 --- a/controllers/tonglian_callback.go +++ b/controllers/tonglian_callback.go @@ -27,6 +27,7 @@ func (c *TongLianController) Msg() { if err == nil { err = financial.OnTLPayCallback(call) } + globals.SugarLogger.Debug("err==============", err) c.Data["json"] = call c.ServeJSON() } else {