diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 97be5a05c..02e7f8638 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1910,7 +1910,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { //京东会员数据 var ( db = dao.GetDB() - pageSize = 50 + pageSize = 20 pages []int ) for page := 1; page < 5; page++ { @@ -1929,7 +1929,11 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { EndAt: utils.Str2Time(v.Endtimestr + " 23:59:59"), } dao.WrapAddIDCULDEntity(userMember, "jxadmin") - userMember.CreatedAt = utils.Str2Time(v.Createtime) + 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() } diff --git a/business/partner/purchase/jd/member.go b/business/partner/purchase/jd/member.go new file mode 100644 index 000000000..fdd9350f9 --- /dev/null +++ b/business/partner/purchase/jd/member.go @@ -0,0 +1 @@ +package jd diff --git a/controllers/jd_callback.go b/controllers/jd_callback.go index 0d6385e40..e78ef269e 100644 --- a/controllers/jd_callback.go +++ b/controllers/jd_callback.go @@ -221,6 +221,7 @@ func (c *DjswController) UpdateSku() { func (c *DjswController) OrderAddTips() { c.orderStatus() } + func (c *DjswController) OrderInfoChange() { if c.Ctx.Input.Method() == http.MethodPost { callbackResponse := c.handleMsg(func(a *jdapi.API, obj interface{}) (callbackResponse *jdapi.CallbackResponse) { @@ -234,6 +235,28 @@ func (c *DjswController) OrderInfoChange() { } } -// func (c *DjswController) OrderInfoChange() { -// c.orderStatus() -// } +func (c *DjswController) MemberCreateCard() { + if c.Ctx.Input.Method() == http.MethodPost { + callbackResponse := c.handleMsg(func(a *jdapi.API, obj interface{}) (callbackResponse *jdapi.CallbackResponse) { + callbackResponse = jd.OnOrderInfoChangeMsg(obj.(*jdapi.CallbackOrderInfoChangeMsg)) + return callbackResponse + }) + c.Data["json"] = c.transferResponse("MemberCreateCard", callbackResponse) + c.ServeJSON() + } else { + c.Abort("404") + } +} + +func (c *DjswController) MemberRenewCard() { + if c.Ctx.Input.Method() == http.MethodPost { + callbackResponse := c.handleMsg(func(a *jdapi.API, obj interface{}) (callbackResponse *jdapi.CallbackResponse) { + callbackResponse = jd.OnOrderInfoChangeMsg(obj.(*jdapi.CallbackOrderInfoChangeMsg)) + return callbackResponse + }) + c.Data["json"] = c.transferResponse("MemberRenewCard", callbackResponse) + c.ServeJSON() + } else { + c.Abort("404") + } +}