新增混合支付+完善新会员充值

business/jxstore/cms/user2.go

@@ -555,15 +555,6 @@ func InvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree bo
 			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 {
@@ -571,6 +562,19 @@ func InvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree bo
 			panic(r)
 		}
 	}()
+	if !isFree {
+		//验证微信绑定
+		if err = auth2.CheckWeixinminiAuthBind(userIDReal); err != nil {
+			return "", err
+		}
+		if userBill.AccountBalance < memberCard.ActPrice {
+			//if _, err := financial.WXInvestMember(ctx, userMembers[0].MemberTypeID, userMembers[0].UserID); err != nil {
+			//	dao.Rollback(db, txDB)
+			//}
+			return model.ErrCodeAccountBalanceNotEnough, fmt.Errorf("用户余额不足，请充值！")
+		}
+	}
+
 	//证明已经开了会员了，相当于续费
 	if len(userMembers) > 0 {
 		userMember := userMembers[0]
@@ -601,7 +605,6 @@ func InvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree bo
 		}
 	}
 	if !isFree {
-
 		//支出明细
 		if err = financial.AddExpendUpdateAccount(txDB, userBill, model.BillTypeMember, memberCard.ActPrice, 0); err != nil {
 			dao.Rollback(db, txDB)