add

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("未找到会员卡配置！")
 	}

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 {

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
 }