From a41052cd9c12e8a75a5a17c70ab06475c1fe1d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 19 Oct 2020 15:15:52 +0800
Subject: [PATCH] member

---
 business/jxstore/cms/user2.go         | 84 +++++++++++++--------------
 routers/commentsRouter_controllers.go |  9 +++
 2 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index 22e8e4486..4a4f9e626 100644
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -587,47 +587,47 @@ func RefreshUserMemberStatus(ctx *jxcontext.Context) (err error) {
 }
 
 func InvestMember(ctx *jxcontext.Context, memberID int) (err error) {
-	var (
-		db          = dao.GetDB()
-		memberCards []*model.MemberCard
-		memberCard  *model.MemberCard
-	)
-	userMembers, err := dao.GetUserMember(db, ctx.GetUserID(), model.MemberTypeNormal)
-	configList, err := dao.QueryConfigs(db, model.ConfigTypeName[model.ConfigTypeMemberCard], model.ConfigTypeMemberCard, "")
-	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
-		}
-	}
-	dao.Begin(db)
-	defer func() {
-		if r := recover(); r != nil {
-			dao.Rollback(db)
-			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)
-		}
-	} else {
-		userMember2 := &model.UserMember{}
-		dao.WrapAddIDCULDEntity(userMember2, ctx.GetUserName())
-	}
-	//账户余额支出
-	//支出明细、
-	dao.Commit(db)
+	// var (
+	// 	db          = dao.GetDB()
+	// 	memberCards []*model.MemberCard
+	// 	memberCard  *model.MemberCard
+	// )
+	// userMembers, err := dao.GetUserMember(db, ctx.GetUserID(), model.MemberTypeNormal)
+	// configList, err := dao.QueryConfigs(db, model.ConfigTypeName[model.ConfigTypeMemberCard], model.ConfigTypeMemberCard, "")
+	// 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
+	// 	}
+	// }
+	// dao.Begin(db)
+	// defer func() {
+	// 	if r := recover(); r != nil {
+	// 		dao.Rollback(db)
+	// 		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)
+	// 	}
+	// } else {
+	// 	userMember2 := &model.UserMember{}
+	// 	dao.WrapAddIDCULDEntity(userMember2, ctx.GetUserName())
+	// }
+	// //账户余额支出
+	// //支出明细、
+	// dao.Commit(db)
 	return err
 }
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index 4fed11d79..27ffaa272 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -349,6 +349,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"],
+        beego.ControllerComments{
+            Method: "InvestMember",
+            Router: `/InvestMember`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"],
         beego.ControllerComments{
             Method: "LoadMyCart",