From 68a7156b5b65ea1186b798922215ee6e3b60b419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 16 Jan 2020 13:35:44 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=89=93=E5=BC=80=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/app.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/app.conf b/conf/app.conf index 72fad8dae..dec33e246 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -106,7 +106,7 @@ getWeixinTokenKey = "c928ed0d-87a3-441a-8517-f92f0167296f" storeName = "京西菜市" useThingMap = true -addEvent = false +addEvent = true [dev] jdOrgCode = "320406" From eb5dcd2435b110de2eab8e46204d36b93f51bb1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 16 Jan 2020 15:20:30 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=90=84=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0cookie=E6=98=AF=E5=90=A6=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/event/event.go | 87 ++++++++++++++++++++++++++++++++- business/jxstore/misc/misc.go | 9 +++- controllers/event.go | 8 ++- 3 files changed, 100 insertions(+), 4 deletions(-) diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go index 8b78a7e24..8c59ccdbb 100644 --- a/business/jxstore/event/event.go +++ b/business/jxstore/event/event.go @@ -4,6 +4,14 @@ import ( "strings" "time" + "git.rosy.net.cn/jx-callback/globals" + + "git.rosy.net.cn/jx-callback/business/partner/purchase/jd" + + "git.rosy.net.cn/jx-callback/globals/api/apimanager" + + "git.rosy.net.cn/jx-callback/globals/api" + "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" @@ -14,6 +22,11 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" ) +type CheckCookie struct { + VendorID int `json:"vendorID"` + Status string `json:"status"` +} + func AddOperateEvent(ctx *jxcontext.Context, accessUUID string) (err error) { var ( apiFunction string @@ -23,8 +36,10 @@ func AddOperateEvent(ctx *jxcontext.Context, accessUUID string) (err error) { if url != "" { apiFunction = url[strings.LastIndex(url, "/")+1 : len(url)] } - if apiFunction[0:2] == "Get" { - return err + if apiFunction != "" { + if apiFunction[0:3] == "Get" { + return err + } } event := &model.OperateEvent{ CreatedAt: time.Now(), @@ -97,3 +112,71 @@ func GetOperateEvents(ctx *jxcontext.Context, apiFunction, name string, operateT } return pageInfo, err } + +func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool) (ccList []*CheckCookie, err error) { + var ( + ebaiOrderID = "1577329467196263592" + ebaiErr = "return not json" + mtOrderID = "69761763472881638" + mtStoreID = "6976176" + jdUpcCode = "6952395700895" + jdErr = "请输入用户名" + errMsg = "" + ) + for _, v := range vendorIDs { + cc := &CheckCookie{} + switch v { + case 3: + resultMap, err := api.EbaiAPI.GetStoreOrderInfo(ebaiOrderID) + if len(resultMap) < 1 && err != nil { + if errExt, ok := err.(*utils.ErrorWithCode); ok { + if strings.Contains(errExt.ErrMsg(), ebaiErr) { + //Cookie无效了 + errMsg += " 饿百Cookie无效了！" + cc.VendorID = v + cc.Status = "无效" + } + } + } else { + //Cookie有效 + cc.VendorID = v + cc.Status = "有效" + } + case 1: + result, err := api.MtwmAPI.GetDistributeOrderDetail(mtOrderID, mtStoreID) + if result == nil && err == nil { + //Cookie无效 + errMsg += " 美团Cookie无效了！" + cc.VendorID = v + cc.Status = "无效" + } else if result != nil { + //Cookie有效 + cc.VendorID = v + cc.Status = "有效" + } + case 0: + for _, vv := range apimanager.CurAPIManager.GetAppOrgCodeList(v) { + result, err := jd.GetAPI(vv).GetJdUpcCodeByName("", jdUpcCode, 1, 5) + if len(result) < 1 && err != nil { + if errExt, ok := err.(*utils.ErrorWithCode); ok { + if strings.Contains(errExt.ErrMsg(), jdErr) { + //Cookie无效 + errMsg += " 京东Cookie无效了！" + cc.VendorID = v + cc.Status = "无效" + } + } + } else { + //Cookie有效 + cc.VendorID = v + cc.Status = "有效" + } + } + } + ccList = append(ccList, cc) + } + if isAuto && len(ccList) > 0 { + globals.SugarLogger.Warnf("GetCheckVendorCookie", errMsg) + } + return ccList, err +} diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 846662330..cf14db6d3 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -41,6 +41,10 @@ var ( "01:00:00", } createStorePriceTimeList = []string{ + "08:00:00", + "18:00:00", + } + checkCookieList = []string{ "02:00:00", } refreshPageActTimeList = []string{ @@ -151,6 +155,9 @@ func Init() { ScheduleTimerFunc("AutoFocusStoreSkusForTopSkus", func() { cms.AutoFocusStoreSkusForTopSkus(jxcontext.AdminCtx, true, true) }, createStorePriceTimeList) + ScheduleTimerFunc("GetCheckVendorCookie", func() { + event.GetCheckVendorCookie(jxcontext.AdminCtx, []int{0, 1, 3}, true) + }, checkCookieList) } ScheduleTimerFunc("AutoSaleStoreSku", func() { cms.AutoSaleStoreSku(jxcontext.AdminCtx, nil, false) @@ -229,7 +236,7 @@ func doDailyWork() { //刷新京东门店的等级 cms.RefreshJdLevel(jxcontext.AdminCtx) //删除操作日志 - event.DeleteOperateEventAndDetail(jxcontext.AdminCtx, time.Now().AddDate(0, 0, -7)) + event.DeleteOperateEventAndDetail(jxcontext.AdminCtx, time.Now().AddDate(0, -1, 0)) } func RefreshRealMobile(ctx *jxcontext.Context, vendorID int, fromTime, toTime time.Time, isAsync, isContinueWhenError bool) (hint string, err error) { diff --git a/controllers/event.go b/controllers/event.go index 87ab75db7..87338f611 100644 --- a/controllers/event.go +++ b/controllers/event.go @@ -44,5 +44,11 @@ func (c *EventController) GetOperateEvents() { // @Failure 200 {object} controllers.CallResult // @router /GetCheckVendorCookie [get] func (c *EventController) GetCheckVendorCookie() { - + var vendorIDList []int + c.callGetCheckVendorCookie(func(params *tEventGetCheckVendorCookieParams) (retVal interface{}, errCode string, err error) { + if jxutils.Strings2Objs(params.VendorIDs, &vendorIDList); err == nil { + retVal, err = event.GetCheckVendorCookie(params.Ctx, vendorIDList, false) + } + return retVal, "", err + }) } From c73b65ad025424a13b6acacb2ef69fdf60b65f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 16 Jan 2020 13:35:44 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=89=93=E5=BC=80=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/app.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/app.conf b/conf/app.conf index 72fad8dae..dec33e246 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -106,7 +106,7 @@ getWeixinTokenKey = "c928ed0d-87a3-441a-8517-f92f0167296f" storeName = "京西菜市" useThingMap = true -addEvent = false +addEvent = true [dev] jdOrgCode = "320406" From e7341c4bfe557abd279af9f574007fa0b89fec7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 16 Jan 2020 15:20:30 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=90=84=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0cookie=E6=98=AF=E5=90=A6=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/event/event.go | 87 ++++++++++++++++++++++++++++++++- business/jxstore/misc/misc.go | 9 +++- controllers/event.go | 8 ++- 3 files changed, 100 insertions(+), 4 deletions(-) diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go index 8b78a7e24..8c59ccdbb 100644 --- a/business/jxstore/event/event.go +++ b/business/jxstore/event/event.go @@ -4,6 +4,14 @@ import ( "strings" "time" + "git.rosy.net.cn/jx-callback/globals" + + "git.rosy.net.cn/jx-callback/business/partner/purchase/jd" + + "git.rosy.net.cn/jx-callback/globals/api/apimanager" + + "git.rosy.net.cn/jx-callback/globals/api" + "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" @@ -14,6 +22,11 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" ) +type CheckCookie struct { + VendorID int `json:"vendorID"` + Status string `json:"status"` +} + func AddOperateEvent(ctx *jxcontext.Context, accessUUID string) (err error) { var ( apiFunction string @@ -23,8 +36,10 @@ func AddOperateEvent(ctx *jxcontext.Context, accessUUID string) (err error) { if url != "" { apiFunction = url[strings.LastIndex(url, "/")+1 : len(url)] } - if apiFunction[0:2] == "Get" { - return err + if apiFunction != "" { + if apiFunction[0:3] == "Get" { + return err + } } event := &model.OperateEvent{ CreatedAt: time.Now(), @@ -97,3 +112,71 @@ func GetOperateEvents(ctx *jxcontext.Context, apiFunction, name string, operateT } return pageInfo, err } + +func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool) (ccList []*CheckCookie, err error) { + var ( + ebaiOrderID = "1577329467196263592" + ebaiErr = "return not json" + mtOrderID = "69761763472881638" + mtStoreID = "6976176" + jdUpcCode = "6952395700895" + jdErr = "请输入用户名" + errMsg = "" + ) + for _, v := range vendorIDs { + cc := &CheckCookie{} + switch v { + case 3: + resultMap, err := api.EbaiAPI.GetStoreOrderInfo(ebaiOrderID) + if len(resultMap) < 1 && err != nil { + if errExt, ok := err.(*utils.ErrorWithCode); ok { + if strings.Contains(errExt.ErrMsg(), ebaiErr) { + //Cookie无效了 + errMsg += " 饿百Cookie无效了！" + cc.VendorID = v + cc.Status = "无效" + } + } + } else { + //Cookie有效 + cc.VendorID = v + cc.Status = "有效" + } + case 1: + result, err := api.MtwmAPI.GetDistributeOrderDetail(mtOrderID, mtStoreID) + if result == nil && err == nil { + //Cookie无效 + errMsg += " 美团Cookie无效了！" + cc.VendorID = v + cc.Status = "无效" + } else if result != nil { + //Cookie有效 + cc.VendorID = v + cc.Status = "有效" + } + case 0: + for _, vv := range apimanager.CurAPIManager.GetAppOrgCodeList(v) { + result, err := jd.GetAPI(vv).GetJdUpcCodeByName("", jdUpcCode, 1, 5) + if len(result) < 1 && err != nil { + if errExt, ok := err.(*utils.ErrorWithCode); ok { + if strings.Contains(errExt.ErrMsg(), jdErr) { + //Cookie无效 + errMsg += " 京东Cookie无效了！" + cc.VendorID = v + cc.Status = "无效" + } + } + } else { + //Cookie有效 + cc.VendorID = v + cc.Status = "有效" + } + } + } + ccList = append(ccList, cc) + } + if isAuto && len(ccList) > 0 { + globals.SugarLogger.Warnf("GetCheckVendorCookie", errMsg) + } + return ccList, err +} diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 846662330..cf14db6d3 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -41,6 +41,10 @@ var ( "01:00:00", } createStorePriceTimeList = []string{ + "08:00:00", + "18:00:00", + } + checkCookieList = []string{ "02:00:00", } refreshPageActTimeList = []string{ @@ -151,6 +155,9 @@ func Init() { ScheduleTimerFunc("AutoFocusStoreSkusForTopSkus", func() { cms.AutoFocusStoreSkusForTopSkus(jxcontext.AdminCtx, true, true) }, createStorePriceTimeList) + ScheduleTimerFunc("GetCheckVendorCookie", func() { + event.GetCheckVendorCookie(jxcontext.AdminCtx, []int{0, 1, 3}, true) + }, checkCookieList) } ScheduleTimerFunc("AutoSaleStoreSku", func() { cms.AutoSaleStoreSku(jxcontext.AdminCtx, nil, false) @@ -229,7 +236,7 @@ func doDailyWork() { //刷新京东门店的等级 cms.RefreshJdLevel(jxcontext.AdminCtx) //删除操作日志 - event.DeleteOperateEventAndDetail(jxcontext.AdminCtx, time.Now().AddDate(0, 0, -7)) + event.DeleteOperateEventAndDetail(jxcontext.AdminCtx, time.Now().AddDate(0, -1, 0)) } func RefreshRealMobile(ctx *jxcontext.Context, vendorID int, fromTime, toTime time.Time, isAsync, isContinueWhenError bool) (hint string, err error) { diff --git a/controllers/event.go b/controllers/event.go index 87ab75db7..87338f611 100644 --- a/controllers/event.go +++ b/controllers/event.go @@ -44,5 +44,11 @@ func (c *EventController) GetOperateEvents() { // @Failure 200 {object} controllers.CallResult // @router /GetCheckVendorCookie [get] func (c *EventController) GetCheckVendorCookie() { - + var vendorIDList []int + c.callGetCheckVendorCookie(func(params *tEventGetCheckVendorCookieParams) (retVal interface{}, errCode string, err error) { + if jxutils.Strings2Objs(params.VendorIDs, &vendorIDList); err == nil { + retVal, err = event.GetCheckVendorCookie(params.Ctx, vendorIDList, false) + } + return retVal, "", err + }) } From 5dabc56adaf3ab5c3a7a05d7b42b397a5f031252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 16 Jan 2020 15:27:20 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/commentsRouter_controllers.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 72a0223a3..60fa07a1e 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -394,6 +394,15 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:EventController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:EventController"], + beego.ControllerComments{ + Method: "GetCheckVendorCookie", + Router: `/GetCheckVendorCookie`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:EventController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:EventController"], beego.ControllerComments{ Method: "GetOperateEvents", From e091afd7468f365026f6119ca32fcf8b4dc8b02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 16 Jan 2020 15:35:25 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=94=BE=E5=BC=80err=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/putils/store_sku.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/partner/putils/store_sku.go b/business/partner/putils/store_sku.go index 74be426f6..30d7231cf 100644 --- a/business/partner/putils/store_sku.go +++ b/business/partner/putils/store_sku.go @@ -299,8 +299,8 @@ func GetErrMsg2FailedSingleList(storeSkuList interface{}, err error, storeID, ve failedList = append(failedList, storeSkuInfoWithErr) } } else { - // globals.SugarLogger.Errorf("GetErrMsg2FailedSingleList:%v", err) - globals.SugarLogger.Debugf("GetErrMsg2FailedSingleList:%v", err) + globals.SugarLogger.Errorf("GetErrMsg2FailedSingleList:%v", err) + // globals.SugarLogger.Debugf("GetErrMsg2FailedSingleList:%v", err) } } return failedList From 7e1e9d9ffa33c3d5012fdc343c9d41e3af026237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 16 Jan 2020 15:55:03 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/putils/store_sku.go | 111 +++++++++++++-------------- 1 file changed, 55 insertions(+), 56 deletions(-) diff --git a/business/partner/putils/store_sku.go b/business/partner/putils/store_sku.go index 30d7231cf..7a085a977 100644 --- a/business/partner/putils/store_sku.go +++ b/business/partner/putils/store_sku.go @@ -5,8 +5,6 @@ import ( "sort" "time" - "git.rosy.net.cn/jx-callback/globals" - "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" @@ -245,62 +243,63 @@ func UnselectStoreSkuListByVendorSkuIDs(storeSkuList []*partner.StoreSkuInfo, ve func GetErrMsg2FailedSingleList(storeSkuList interface{}, err error, storeID, vendorID int, syncType string) (failedList []*partner.StoreSkuInfoWithErr) { if err != nil { + var errMsg string if errExt, ok := err.(*utils.ErrorWithCode); ok { - if storeSkuLists, ok := storeSkuList.([]*partner.StoreSkuInfo); ok { - storeSkuInfoWithErr := &partner.StoreSkuInfoWithErr{ - StoreSkuInfo: storeSkuLists[0], - ErrMsg: errExt.ErrMsg(), - StoreID: storeID, - VendoreID: vendorID, - SyncType: syncType, - } - failedList = append(failedList, storeSkuInfoWithErr) - } else if storeSkuLists, ok := storeSkuList.([]*dao.StoreSkuSyncInfo); ok { - storeSkuInfo := &partner.StoreSkuInfo{ - SkuID: storeSkuLists[0].SkuID, - VendorSkuID: storeSkuLists[0].VendorSkuID, - NameID: storeSkuLists[0].NameID, - VendorNameID: storeSkuLists[0].VendorNameID, - VendorPrice: storeSkuLists[0].VendorPrice, - Status: storeSkuLists[0].Status, - } - storeSkuInfoWithErr := &partner.StoreSkuInfoWithErr{ - StoreSkuInfo: storeSkuInfo, - ErrMsg: errExt.ErrMsg(), - StoreID: storeID, - VendoreID: vendorID, - SyncType: syncType, - } - failedList = append(failedList, storeSkuInfoWithErr) - } else if storeSku, ok := storeSkuList.(*dao.StoreSkuSyncInfo); ok { - storeSkuInfo := &partner.StoreSkuInfo{ - SkuID: storeSku.SkuID, - VendorSkuID: storeSku.VendorSkuID, - NameID: storeSku.NameID, - VendorNameID: storeSku.VendorNameID, - VendorPrice: storeSku.VendorPrice, - Status: storeSku.Status, - } - storeSkuInfoWithErr := &partner.StoreSkuInfoWithErr{ - StoreSkuInfo: storeSkuInfo, - ErrMsg: errExt.ErrMsg(), - StoreID: storeID, - VendoreID: vendorID, - SyncType: syncType, - } - failedList = append(failedList, storeSkuInfoWithErr) - } else { - storeSkuInfoWithErr := &partner.StoreSkuInfoWithErr{ - ErrMsg: errExt.ErrMsg(), - StoreID: storeID, - VendoreID: vendorID, - SyncType: syncType, - } - failedList = append(failedList, storeSkuInfoWithErr) - } + errMsg = errExt.ErrMsg() } else { - globals.SugarLogger.Errorf("GetErrMsg2FailedSingleList:%v", err) - // globals.SugarLogger.Debugf("GetErrMsg2FailedSingleList:%v", err) + errMsg = err.Error() + } + if storeSkuLists, ok := storeSkuList.([]*partner.StoreSkuInfo); ok { + storeSkuInfoWithErr := &partner.StoreSkuInfoWithErr{ + StoreSkuInfo: storeSkuLists[0], + ErrMsg: errMsg, + StoreID: storeID, + VendoreID: vendorID, + SyncType: syncType, + } + failedList = append(failedList, storeSkuInfoWithErr) + } else if storeSkuLists, ok := storeSkuList.([]*dao.StoreSkuSyncInfo); ok { + storeSkuInfo := &partner.StoreSkuInfo{ + SkuID: storeSkuLists[0].SkuID, + VendorSkuID: storeSkuLists[0].VendorSkuID, + NameID: storeSkuLists[0].NameID, + VendorNameID: storeSkuLists[0].VendorNameID, + VendorPrice: storeSkuLists[0].VendorPrice, + Status: storeSkuLists[0].Status, + } + storeSkuInfoWithErr := &partner.StoreSkuInfoWithErr{ + StoreSkuInfo: storeSkuInfo, + ErrMsg: errMsg, + StoreID: storeID, + VendoreID: vendorID, + SyncType: syncType, + } + failedList = append(failedList, storeSkuInfoWithErr) + } else if storeSku, ok := storeSkuList.(*dao.StoreSkuSyncInfo); ok { + storeSkuInfo := &partner.StoreSkuInfo{ + SkuID: storeSku.SkuID, + VendorSkuID: storeSku.VendorSkuID, + NameID: storeSku.NameID, + VendorNameID: storeSku.VendorNameID, + VendorPrice: storeSku.VendorPrice, + Status: storeSku.Status, + } + storeSkuInfoWithErr := &partner.StoreSkuInfoWithErr{ + StoreSkuInfo: storeSkuInfo, + ErrMsg: errMsg, + StoreID: storeID, + VendoreID: vendorID, + SyncType: syncType, + } + failedList = append(failedList, storeSkuInfoWithErr) + } else { + storeSkuInfoWithErr := &partner.StoreSkuInfoWithErr{ + ErrMsg: errMsg, + StoreID: storeID, + VendoreID: vendorID, + SyncType: syncType, + } + failedList = append(failedList, storeSkuInfoWithErr) } } return failedList From 597398c9f6a594cf2dd6cf5c6c7600003abde617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 16 Jan 2020 16:00:09 +0800 Subject: [PATCH 08/11] =?UTF-8?q?Cookie=E9=AA=8C=E8=AF=81=E7=BE=8E?= =?UTF-8?q?=E5=9B=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/event/event.go | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go index 8c59ccdbb..c8b4a4d52 100644 --- a/business/jxstore/event/event.go +++ b/business/jxstore/event/event.go @@ -119,6 +119,7 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool) ebaiErr = "return not json" mtOrderID = "69761763472881638" mtStoreID = "6976176" + mtErr = "返回结果格式不正常" jdUpcCode = "6952395700895" jdErr = "请输入用户名" errMsg = "" @@ -143,13 +144,16 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool) cc.Status = "有效" } case 1: - result, err := api.MtwmAPI.GetDistributeOrderDetail(mtOrderID, mtStoreID) - if result == nil && err == nil { - //Cookie无效 - errMsg += " 美团Cookie无效了！" - cc.VendorID = v - cc.Status = "无效" - } else if result != nil { + err := api.MtwmAPI.OrderModityTips(mtOrderID, mtStoreID, 0.2) + if err != nil { + if errExt, ok := err.(*utils.ErrorWithCode); ok { + if strings.Contains(errExt.ErrMsg(), mtErr) { + errMsg += " 美团Cookie无效了！" + cc.VendorID = v + cc.Status = "无效" + } + } + } else { //Cookie有效 cc.VendorID = v cc.Status = "有效" From 87529c13a8d9d6b953a30cc6414a3808b4b9e3e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 16 Jan 2020 16:04:13 +0800 Subject: [PATCH 09/11] =?UTF-8?q?Cookie=E9=AA=8C=E8=AF=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/event/event.go | 34 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go index c8b4a4d52..454b9e079 100644 --- a/business/jxstore/event/event.go +++ b/business/jxstore/event/event.go @@ -130,13 +130,11 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool) case 3: resultMap, err := api.EbaiAPI.GetStoreOrderInfo(ebaiOrderID) if len(resultMap) < 1 && err != nil { - if errExt, ok := err.(*utils.ErrorWithCode); ok { - if strings.Contains(errExt.ErrMsg(), ebaiErr) { - //Cookie无效了 - errMsg += " 饿百Cookie无效了！" - cc.VendorID = v - cc.Status = "无效" - } + if strings.Contains(err.Error(), ebaiErr) { + //Cookie无效了 + errMsg += " 饿百Cookie无效了！" + cc.VendorID = v + cc.Status = "无效" } } else { //Cookie有效 @@ -146,12 +144,10 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool) case 1: err := api.MtwmAPI.OrderModityTips(mtOrderID, mtStoreID, 0.2) if err != nil { - if errExt, ok := err.(*utils.ErrorWithCode); ok { - if strings.Contains(errExt.ErrMsg(), mtErr) { - errMsg += " 美团Cookie无效了！" - cc.VendorID = v - cc.Status = "无效" - } + if strings.Contains(err.Error(), mtErr) { + errMsg += " 美团Cookie无效了！" + cc.VendorID = v + cc.Status = "无效" } } else { //Cookie有效 @@ -162,13 +158,11 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool) for _, vv := range apimanager.CurAPIManager.GetAppOrgCodeList(v) { result, err := jd.GetAPI(vv).GetJdUpcCodeByName("", jdUpcCode, 1, 5) if len(result) < 1 && err != nil { - if errExt, ok := err.(*utils.ErrorWithCode); ok { - if strings.Contains(errExt.ErrMsg(), jdErr) { - //Cookie无效 - errMsg += " 京东Cookie无效了！" - cc.VendorID = v - cc.Status = "无效" - } + if strings.Contains(err.Error(), jdErr) { + //Cookie无效 + errMsg += " 京东Cookie无效了！" + cc.VendorID = v + cc.Status = "无效" } } else { //Cookie有效 From d53aee66b14cc7e2b94d9215f41b04b8a3f16224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 16 Jan 2020 16:08:43 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E7=BE=8Ecoo=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/event/event.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go index 454b9e079..d79b11f21 100644 --- a/business/jxstore/event/event.go +++ b/business/jxstore/event/event.go @@ -144,6 +144,7 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool) case 1: err := api.MtwmAPI.OrderModityTips(mtOrderID, mtStoreID, 0.2) if err != nil { + cc.Status = err.Error() if strings.Contains(err.Error(), mtErr) { errMsg += " 美团Cookie无效了！" cc.VendorID = v From 2c2f15c440f499364e81151338db53fc4215a4f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 16 Jan 2020 16:15:24 +0800 Subject: [PATCH 11/11] =?UTF-8?q?cookie=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/event/event.go | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go index d79b11f21..2772be8ba 100644 --- a/business/jxstore/event/event.go +++ b/business/jxstore/event/event.go @@ -125,6 +125,7 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool) errMsg = "" ) for _, v := range vendorIDs { + var flag = false cc := &CheckCookie{} switch v { case 3: @@ -133,27 +134,16 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool) if strings.Contains(err.Error(), ebaiErr) { //Cookie无效了 errMsg += " 饿百Cookie无效了！" - cc.VendorID = v - cc.Status = "无效" + flag = true } - } else { - //Cookie有效 - cc.VendorID = v - cc.Status = "有效" } case 1: err := api.MtwmAPI.OrderModityTips(mtOrderID, mtStoreID, 0.2) if err != nil { - cc.Status = err.Error() if strings.Contains(err.Error(), mtErr) { errMsg += " 美团Cookie无效了！" - cc.VendorID = v - cc.Status = "无效" + flag = true } - } else { - //Cookie有效 - cc.VendorID = v - cc.Status = "有效" } case 0: for _, vv := range apimanager.CurAPIManager.GetAppOrgCodeList(v) { @@ -162,16 +152,17 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool) if strings.Contains(err.Error(), jdErr) { //Cookie无效 errMsg += " 京东Cookie无效了！" - cc.VendorID = v - cc.Status = "无效" + flag = true } - } else { - //Cookie有效 - cc.VendorID = v - cc.Status = "有效" } } } + cc.VendorID = v + if flag { + cc.Status = "无效" + } else { + cc.Status = "有效" + } ccList = append(ccList, cc) } if isAuto && len(ccList) > 0 {