diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 99cc8c604..a8771dd12 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -2,7 +2,6 @@ package misc import ( "fmt" - "strings" "sync" "time" @@ -166,9 +165,6 @@ func Init() { ScheduleTimerFunc("doDailyWork", doDailyWork, dailyWorkTimeList) ScheduleTimerFunc("doDailyWork2", doDailyWork2, dailyWorkTimeList2) - // ScheduleTimerFuncByInterval(func() { - // orderman.SaveJdsOrders(jxcontext.AdminCtx, time.Now().Add(-20*time.Minute), time.Now()) - // }, 10*time.Second, 10*time.Minute) //京东的订单信息解密密钥获取 ScheduleTimerFuncByInterval(func() { @@ -532,11 +528,11 @@ func RefreshRealMobile(ctx *jxcontext.Context, vendorID int, fromTime, toTime ti order := batchItemList[0].(*model.GoodsOrder) mobile, err2 := handler.GetOrderRealMobile(ctx, order) if err = err2; err == nil { - mobile = jxutils.FormalizeMobile(mobile) - if jxutils.IsStringLikeMobile(mobile) && strings.Index(order.ConsigneeMobile, mobile) == -1 { - order.ConsigneeMobile2 = mobile - _, err = dao.UpdateEntity(db, order, "ConsigneeMobile2") - } + //mobile = jxutils.FormalizeMobile(mobile) + //if jxutils.IsStringLikeMobile(mobile) && strings.Index(order.ConsigneeMobile, mobile) == -1 { + order.ConsigneeMobile2 = mobile + _, err = dao.UpdateEntity(db, order, "ConsigneeMobile2") + //} } else { globals.SugarLogger.Infof("RefreshRealMobile orderID:%s failed with error:%v", order.VendorOrderID, err) } diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 6cc2a104b..d16448980 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1917,26 +1917,23 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { results, _ := api.JdAPI.QueryMemberTransListByCondition(page, pageSize) for _, v := range results { if utils.Str2Time(v.Endtimestr+" 23:59:59").Sub(time.Now()) >= 0 { - 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) + 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) } } }