From 0dd82e1d7bd311b8dd35410f85e602a00aecf447 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Thu, 27 May 2021 10:55:14 +0800
Subject: [PATCH] aa

---
 business/jxstore/report/report.go | 78 ++++++++++++++++---------------
 business/jxstore/tempop/tempop.go |  3 +-
 2 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go
index 5476522dd..8a8447d48 100644
--- a/business/jxstore/report/report.go
+++ b/business/jxstore/report/report.go
@@ -662,44 +662,46 @@ func RefreshJDMembers(ctx *jxcontext.Context) (err error) {
 	for ; page > 0; page-- {
 		pages = append(pages, page)
 	}
-	task := tasksch.NewParallelTask2("RefreshJDMembers", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
-		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, successCount int, err error) {
-			pageNo := batchItemList[0].(int)
-			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 && 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")
-								dao.UpdateEntity(db, memberMap[v.Merchantcardno], "EndAt")
-							}
-						} else {
-							userMember := &model.UserMember{
-								VendorOrderID: v.Orderid,
-								VendorID:      model.VendorIDJD,
-								Mobile:        v.Merchantcardno,
-								MemberType:    1,
-								EndAt:         utils.Str2Time(v.Endtimestr + " 23:59:59"),
-							}
-							dao.WrapAddIDCULDEntity(userMember, "jxadmin")
-							if v.Createtime != "" {
-								userMember.CreatedAt = utils.Str2Time(v.Createtime)
-							} else {
-								userMember.CreatedAt = utils.Str2Time(v.Cardcreatetime)
-							}
-							if userMember.EndAt.Sub(time.Now()) <= 0 {
-								userMember.DeletedAt = time.Now()
-							}
-							dao.CreateEntity(db, userMember)
-						}
-					}
-				}
-			}
-			return retVal, successCount, err
-		}, pages)
-	tasksch.HandleTask(task, nil, true).Run()
-	task.GetID()
+	fmt.Println("RefreshJDMembers map 111111111111111111111111111111111", memberMap)
+	//task := tasksch.NewParallelTask2("RefreshJDMembers", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
+	//	func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, successCount int, err error) {
+	//		pageNo := batchItemList[0].(int)
+	//		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 && 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")
+	//							memberMap[v.Merchantcardno].DeletedAt = utils.DefaultTimeValue
+	//							dao.UpdateEntity(db, memberMap[v.Merchantcardno], "EndAt", "DeletedAt")
+	//						}
+	//					} else {
+	//						userMember := &model.UserMember{
+	//							VendorOrderID: v.Orderid,
+	//							VendorID:      model.VendorIDJD,
+	//							Mobile:        v.Merchantcardno,
+	//							MemberType:    1,
+	//							EndAt:         utils.Str2Time(v.Endtimestr + " 23:59:59"),
+	//						}
+	//						dao.WrapAddIDCULDEntity(userMember, "jxadmin")
+	//						if v.Createtime != "" {
+	//							userMember.CreatedAt = utils.Str2Time(v.Createtime)
+	//						} else {
+	//							userMember.CreatedAt = utils.Str2Time(v.Cardcreatetime)
+	//						}
+	//						if userMember.EndAt.Sub(time.Now()) <= 0 {
+	//							userMember.DeletedAt = time.Now()
+	//						}
+	//						dao.CreateEntity(db, userMember)
+	//					}
+	//				}
+	//			}
+	//		}
+	//		return retVal, successCount, err
+	//	}, pages)
+	//tasksch.HandleTask(task, nil, true).Run()
+	//task.GetID()
 	return err
 }
 
diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index d39e74b25..efcdd42fb 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"git.rosy.net.cn/jx-callback/business/jxstore/report"
 	"regexp"
 	"strings"
 	"time"
@@ -1923,7 +1924,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	//		dao.UpdateEntity(db, v, "ConsigneeMobile2")
 	//	}
 	//}
-	cms.SendQywxPeopleCount(jxcontext.AdminCtx)
+	report.RefreshJDMembers(jxcontext.AdminCtx)
 	return err
 }