From 6cc34d2a6d9703aba354ae20164cbb4111f26b5e Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Fri, 22 Jul 2022 16:45:44 +0800
Subject: [PATCH] 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
 }