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

---
 business/jxstore/tempop/tempop.go | 35 +++++++++++++++++--------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 02e7f8638..340207e71 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1921,23 +1921,26 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 			page := batchItemList[0].(int)
 			results, _ := api.JdAPI.QueryMemberTransListByCondition(page, pageSize)
 			for _, v := range results {
-				userMember := &model.UserMember{
-					VendorOrderID: v.Orderid,
-					VendorID:      model.VendorIDJD,
-					Mobile:        v.Merchantcardno,
-					MemberType:    1,
-					EndAt:         utils.Str2Time(v.Endtimestr + " 23:59:59"),
+				userMembers, _ := dao.GetUserMember(db, "", "", v.Merchantcardno, model.VendorIDJD, 0, -1)
+				if len(userMembers) == 0 {
+					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)
 				}
-				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)