From b43d88543661ec59fdd8aae63ae3dd0e1a2bb825 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Thu, 13 May 2021 13:47:38 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/user2.go                 |  4 ++--
 business/model/dao/dao_user.go                | 10 +++++++++-
 business/partner/purchase/jx/localjx/order.go |  5 ++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index 7187af5ae..0fd000996 100644
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -806,7 +806,7 @@ func GetSelfInfo(ctx *jxcontext.Context) (getSelfInfoResult *dao.GetSelfInfoResu
 	tokenInfo, err := auth2.GetTokenInfo(ctx.GetToken())
 	if err == nil {
 		if getSelfInfoResult, err = dao.GetUserByIDWithMembers(dao.GetDB(), "user_id", tokenInfo.GetID()); err == nil {
-			if userMembers, err3 := dao.GetUserMember(dao.GetDB(), getSelfInfoResult.UserID, "", 0, model.YES); err3 == nil {
+			if userMembers, err3 := dao.GetUserMember(dao.GetDB(), getSelfInfoResult.UserID, "", "", model.VendorIDJX, 0, model.YES); err3 == nil {
 				getSelfInfoResult.UserMembers = userMembers
 			} else {
 				err = err3
@@ -1159,7 +1159,7 @@ func RefreshUserMemberStatus(ctx *jxcontext.Context) (err error) {
 	var (
 		db = dao.GetDB()
 	)
-	userMembers, err := dao.GetUserMember(db, "", "", model.MemberTypeDiscountCard, -1)
+	userMembers, err := dao.GetUserMember(db, "", "", "", -1, model.MemberTypeDiscountCard, -1)
 	for _, userMember := range userMembers {
 		if time.Now().Sub(userMember.EndAt) > 0 {
 			userMember.DeletedAt = time.Now()
diff --git a/business/model/dao/dao_user.go b/business/model/dao/dao_user.go
index cc625908d..9172cc55b 100644
--- a/business/model/dao/dao_user.go
+++ b/business/model/dao/dao_user.go
@@ -283,7 +283,7 @@ func GetUserOrderSMS(db *DaoDB, mobile, name string) (userOrderSms *model.UserOr
 	return userOrderSms, err
 }
 
-func GetUserMember(db *DaoDB, userID, vendorOrderID string, memberType, isPay int) (userMembers []*model.UserMember, err error) {
+func GetUserMember(db *DaoDB, userID, vendorOrderID, mobile string, vendorID, memberType, isPay int) (userMembers []*model.UserMember, err error) {
 	sql := `
 		SELECT * 
 		  FROM user_member
@@ -298,6 +298,10 @@ func GetUserMember(db *DaoDB, userID, vendorOrderID string, memberType, isPay in
 		sql += " AND vendor_order_id = ?"
 		sqlParams = append(sqlParams, vendorOrderID)
 	}
+	if mobile != "" {
+		sql += " AND mobile = ?"
+		sqlParams = append(sqlParams, mobile)
+	}
 	if memberType != 0 {
 		sql += " AND member_type = ?"
 		sqlParams = append(sqlParams, memberType)
@@ -306,6 +310,10 @@ func GetUserMember(db *DaoDB, userID, vendorOrderID string, memberType, isPay in
 		sql += " AND is_pay = ?"
 		sqlParams = append(sqlParams, isPay)
 	}
+	if vendorID != -1 {
+		sql += " AND vendor_id = ?"
+		sqlParams = append(sqlParams, vendorID)
+	}
 	err = GetRows(db, &userMembers, sql, sqlParams)
 	return userMembers, err
 }
diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index f308a44d9..d63a9f9e1 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -372,13 +372,16 @@ func Pay4User(ctx *jxcontext.Context, thingID int, vendorOrderID string, payType
 				dao.WrapAddIDCULDEntity(orderPay, ctx.GetUserName())
 				err = dao.CreateEntity(dao.GetDB(), orderPay)
 			}
+			mobile, userID := ctx.GetMobileAndUserID()
 			userMember := &model.UserMember{
 				VendorOrderID: vendorOrderID,
-				UserID:        ctx.GetUserID(),
+				UserID:        userID,
 				MemberType:    model.MemberTypeDiscountCard,
 				EndAt:         utils.Str2Time(time.Now().AddDate(0, 1, 0).AddDate(0, 0, -1).Format("2006-01-02") + " 23:59:59"),
 				MemberTypeID:  thingID,
 				IsPay:         model.NO,
+				VendorID:      model.VendorIDJX,
+				Mobile:        mobile,
 			}
 			dao.WrapAddIDCULDEntity(userMember, ctx.GetUserName())
 			if flag == 0 {