From 83bd9726ac11a82aa2ebc9f61a92e2f359e3b2ca Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Wed, 19 May 2021 10:25:12 +0800
Subject: [PATCH] aa

---
 business/jxstore/misc/misc.go     | 3 ++-
 business/jxstore/report/report.go | 2 +-
 business/model/dao/report.go      | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 7b76f61bb..b8f1a6dcd 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -179,7 +179,6 @@ func Init() {
 			defsch.FixedScheduler.ConfirmSelfTakeOrders(jxcontext.AdminCtx, []int{model.VendorIDJD}, time.Now().Add(-48*time.Hour), time.Now().Add(-30*time.Minute), true, true)
 		}, 5*time.Second, 10*time.Minute)
 
-		//20分钟一次，两个统计
 		ScheduleTimerFuncByInterval(func() {
 			report.RefreshStoreManageState(jxcontext.AdminCtx)
 		}, 5*time.Second, 20*time.Minute)
@@ -356,6 +355,8 @@ func syncStoreSku() {
 		if true {
 			syncFlag |= model.SyncFlagSaleMask
 		}
+	} else {
+		syncFlag |= model.SyncFlagSaleMask
 	}
 	task := tasksch.NewParallelTask("同步京西与平台数据", nil, jxcontext.AdminCtx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go
index 7efcb9022..4414e02c5 100644
--- a/business/jxstore/report/report.go
+++ b/business/jxstore/report/report.go
@@ -668,7 +668,7 @@ func RefreshJDMembers(ctx *jxcontext.Context) (err error) {
 			pageResult2, err := api.JdAPI.QueryMemberTransListByCondition("", "", pageNo, pageSize)
 			if pageResult2 != nil {
 				for _, v := range pageResult2.Rows {
-					if utils.Str2Time(v.Endtimestr+" 23:59:59").Sub(time.Now()) >= 0 {
+					if utils.Str2Time(v.Endtimestr+" 23:59:59").Sub(time.Now()) >= 0 && v.Dealstatus == 0 {
 						if memberMap[v.Merchantcardno] != nil { //库里有这个人的会员信息了
 							if utils.Time2Str(memberMap[v.Merchantcardno].EndAt) != v.Endtimestr+" 23:59:59" { //可能这个人续费了，续存了
 								memberMap[v.Merchantcardno].EndAt = utils.Str2Time(v.Endtimestr + " 23:59:59")
diff --git a/business/model/dao/report.go b/business/model/dao/report.go
index 591c9f260..f46c56d24 100644
--- a/business/model/dao/report.go
+++ b/business/model/dao/report.go
@@ -377,11 +377,11 @@ func DeletePriceReferHistory(db *DaoDB, snapDate time.Time) (num int64, err erro
 
 func UserMemberReport(db *DaoDB, vendorID int, keyword string, offset, pageSize int) (page *model.PagedInfo, err error) {
 	sql := `
-		SELECT SQL_CALC_FOUND_ROWS DISTINCT a.mobile, IF(a.vendor_id = ?, c.name, b.consignee_name) name  
+		SELECT SQL_CALC_FOUND_ROWS DISTINCT a.mobile, IF(a.vendor_id = ?, c.name, b.consignee_name) name, 
 		  FROM user_member a 	
 		  LEFT JOIN goods_order b ON a.mobile = b.consignee_mobile2 AND b.status <> ?
 		  LEFT JOIN user c ON c.mobile = a.mobile
-      GROUP BY 
+      GROUP BY 1, 2
 	`
 	sqlParams := []interface{}{
 		model.VendorIDJX, model.OrderStatusCanceled,