From 5f01bc43aeb2ab4a8b84cbf84a2e325faa78b783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 18 Sep 2020 15:16:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/user2.go  | 10 ++++++++++
 business/jxstore/misc/misc.go  |  1 +
 business/model/dao/dao_user.go |  2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index 15b795bed..9be1c3c74 100644
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -1142,5 +1142,15 @@ func CleanUserOrderSMSMark(ctx *jxcontext.Context) (err error) {
 }
 
 func RefreshUserMemberStatus(ctx *jxcontext.Context) (err error) {
+	var (
+		db = dao.GetDB()
+	)
+	userMembers, err := dao.GetUserMember(db, "", "", model.MemberTypeDiscountCard, -1)
+	for _, userMember := range userMembers {
+		if time.Now().Sub(userMember.EndAt) > 0 {
+			userMember.DeletedAt = time.Now()
+			dao.UpdateEntity(db, userMember, "DeletedAt")
+		}
+	}
 	return err
 }
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 0962cee89..9c2cb8b85 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -268,6 +268,7 @@ func Init() {
 			act.ChangeJxPriceByDiscountAct(jxcontext.AdminCtx)
 		}, discountActJxList)
 		ScheduleTimerFunc("RefreshUserMemberStatus", func() {
+			cms.RefreshUserMemberStatus(jxcontext.AdminCtx)
 		}, updateActStatusTimeList)
 	}
 	ScheduleTimerFunc("AutoSaleStoreSku", func() {
diff --git a/business/model/dao/dao_user.go b/business/model/dao/dao_user.go
index 4cc4733eb..456262c72 100644
--- a/business/model/dao/dao_user.go
+++ b/business/model/dao/dao_user.go
@@ -278,7 +278,7 @@ func GetUserMember(db *DaoDB, userID, vendorOrderID string, memberType, isPay in
 		sql += " AND member_type = ?"
 		sqlParams = append(sqlParams, memberType)
 	}
-	if isPay != 0 {
+	if isPay != -1 {
 		sql += " AND is_pay = ?"
 		sqlParams = append(sqlParams, isPay)
 	}