diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 8efbc2c67..70fc3ca65 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -124,19 +124,19 @@ var ( cancelPayTimeOutOrderList = localjx.GetHalfHoursList() discountActJxList = localjx.GetDiscountActHoursList() - ebaiStorePageCookieExdTOKEN string - ebaiStorePageCookieWMUSS2 string - ebaiStorePageCookieWMSTOKEN2 string - ebaiStorePageCookieWMUSS string - ebaiStorePageCookieWMSTOKEN string - mtwmCookieStr string - mtpsStoreToken string - jd2StorePageCookie string - JdStorePageCookie string - yinbaoCookie string - feiePageCookie string - jdStorePageEarning string - jdsCookie string + //ebaiStorePageCookieExdTOKEN string + //ebaiStorePageCookieWMUSS2 string + //ebaiStorePageCookieWMSTOKEN2 string + ebaiStorePageCookie string + //ebaiStorePageCookieWMSTOKEN string + mtwmCookieStr string + mtpsStoreToken string + jd2StorePageCookie string + JdStorePageCookie string + yinbaoCookie string + feiePageCookie string + jdStorePageEarning string + jdsCookie string // jdsCookie2 string ) @@ -248,26 +248,6 @@ func Init() { ScheduleTimerFunc("CleanUserOrderSMSMark", func() { cms.CleanUserOrderSMSMark(jxcontext.AdminCtx) }, priceReferTimeList) - // ScheduleTimerFunc("exSync", func() { - // var ( - // db = dao.GetDB() - // storeList []int - // exSyncStoreIDList string - // syncFlag = 0 - // ) - // syncFlag = model.SyncFlagPriceMask - // if (time.Now().Unix()/24*3600)%10 == 0 { - // syncFlag |= model.SyncFlagSaleMask - // } - // if configs, err := dao.QueryConfigs(dao.GetDB(), "exSyncStoreIDList", model.ConfigTypeSys, ""); err == nil { - // exSyncStoreIDList = configs[0].Value - // } - // storeIDList := strings.Split(exSyncStoreIDList, ",") - // for _, v := range storeIDList { - // storeList = append(storeList, int(utils.Str2Int64(v))) - // } - // cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, db, partner.GetMultiStoreVendorIDs(), storeList, false, nil, []int{27379}, syncFlag, true, true) - // }, exSyncList) ScheduleTimerFunc("CreateOrderByPriceDefend", func() { localjx.CreateOrderByPriceDefend(jxcontext.AdminCtx) }, []string{ @@ -323,20 +303,8 @@ func Init() { "22:00:00", }) } - if configs, err := dao.QueryConfigs(dao.GetDB(), "ebaiStorePageCookieExdTOKEN", model.ConfigTypeCookie, ""); err == nil { - ebaiStorePageCookieExdTOKEN = configs[0].Value - } - if configs, err := dao.QueryConfigs(dao.GetDB(), "ebaiStorePageCookieWMUSS2", model.ConfigTypeCookie, ""); err == nil { - ebaiStorePageCookieWMUSS2 = configs[0].Value - } - if configs, err := dao.QueryConfigs(dao.GetDB(), "ebaiStorePageCookieWMSTOKEN2", model.ConfigTypeCookie, ""); err == nil { - ebaiStorePageCookieWMSTOKEN2 = configs[0].Value - } - if configs, err := dao.QueryConfigs(dao.GetDB(), "ebaiStorePageCookieWMUSS", model.ConfigTypeCookie, ""); err == nil { - ebaiStorePageCookieWMUSS = configs[0].Value - } - if configs, err := dao.QueryConfigs(dao.GetDB(), "ebaiStorePageCookieWMSTOKEN", model.ConfigTypeCookie, ""); err == nil { - ebaiStorePageCookieWMSTOKEN = configs[0].Value + if configs, err := dao.QueryConfigs(dao.GetDB(), "ebaiStorePageCookie", model.ConfigTypeCookie, ""); err == nil { + ebaiStorePageCookie = configs[0].Value } if configs, err := dao.QueryConfigs(dao.GetDB(), "mtwmCookieStr", model.ConfigTypeCookie, ""); err == nil { mtwmCookieStr = configs[0].Value @@ -367,12 +335,13 @@ func Init() { if globals.Jd2OrgCode != "" { api.Jd2API.SetJdCookie(jd2StorePageCookie) } - api.EbaiAPI.SetCookie("PASSPORT_DELIMONT_TOKEN", ebaiStorePageCookieExdTOKEN) - api.EbaiAPI.SetCookie("WMUSS", ebaiStorePageCookieWMUSS) - api.EbaiAPI.SetCookie("WMSTOKEN", ebaiStorePageCookieWMSTOKEN) - api.Ebai2API.SetCookie("PASSPORT_DELIMONT_TOKEN", ebaiStorePageCookieExdTOKEN) - api.Ebai2API.SetCookie("WMUSS", ebaiStorePageCookieWMUSS2) - api.Ebai2API.SetCookie("WMSTOKEN", ebaiStorePageCookieWMSTOKEN2) + //api.EbaiAPI.SetCookie("PASSPORT_DELIMONT_TOKEN", ebaiStorePageCookieExdTOKEN) + //api.EbaiAPI.SetCookie("WMUSS", ebaiStorePageCookieWMUSS) + //api.EbaiAPI.SetCookie("WMSTOKEN", ebaiStorePageCookieWMSTOKEN) + //api.Ebai2API.SetCookie("PASSPORT_DELIMONT_TOKEN", ebaiStorePageCookieExdTOKEN) + //api.Ebai2API.SetCookie("WMUSS", ebaiStorePageCookieWMUSS2) + //api.Ebai2API.SetCookie("WMSTOKEN", ebaiStorePageCookieWMSTOKEN2) + api.EbaiAPI.SetCookieWithStr(ebaiStorePageCookie) api.MtwmAPI.SetCookieWithStr(mtwmCookieStr) api.MtpsAPI.SetCookie("token", mtpsStoreToken) api.JdAPI.SetJdCookie(JdStorePageCookie) diff --git a/controllers/jd_callback.go b/controllers/jd_callback.go index 0b58d0284..0c3655f92 100644 --- a/controllers/jd_callback.go +++ b/controllers/jd_callback.go @@ -235,28 +235,29 @@ func (c *DjswController) OrderInfoChange() { } } -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.MemberCreateMsg(obj.(*jdapi.CallbackMemberMsg)) - 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.MemberRenewMsg(obj.(*jdapi.CallbackMemberMsg)) - return callbackResponse - }) - c.Data["json"] = c.transferResponse("MemberRenewCard", callbackResponse) - c.ServeJSON() - } else { - c.Abort("404") - } -} +//免费开卡接不到回调 +//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.MemberCreateMsg(obj.(*jdapi.CallbackMemberMsg)) +// 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.MemberRenewMsg(obj.(*jdapi.CallbackMemberMsg)) +// return callbackResponse +// }) +// c.Data["json"] = c.transferResponse("MemberRenewCard", callbackResponse) +// c.ServeJSON() +// } else { +// c.Abort("404") +// } +//}