From f49143cc8ec07e2f30816c8a0d41ccb75c770b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Fri, 17 Jan 2020 09:28:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8F=92=E5=85=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store_sku.go | 5 ++++- business/jxstore/event/event.go | 5 +---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 86f19e032..921968446 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -1183,6 +1183,9 @@ func getSkuSaleStatus(inSkuBind *StoreSkuBindSkuInfo, skuNameBindInfo *StoreSkuB } func AddEventDetail(db *dao.DaoDB, ctx *jxcontext.Context, operateType, thingID, thingType, storeID int, beforeData, afterData string) (err error) { + if ctx.GetUserName() == "jxadmin" { + return err + } operateEventDetail := &model.OperateEventDetail{ OperateType: operateType, ThingID: thingID, @@ -1192,7 +1195,7 @@ func AddEventDetail(db *dao.DaoDB, ctx *jxcontext.Context, operateType, thingID, BeforeData: beforeData, AfterData: afterData, } - err = event.AddOperateEventDetail(db, ctx, operateEventDetail) + err = event.AddOperateEventDetail(db, operateEventDetail) return err } diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go index 8ed4589d7..e37892552 100644 --- a/business/jxstore/event/event.go +++ b/business/jxstore/event/event.go @@ -60,10 +60,7 @@ func AddOperateEvent(ctx *jxcontext.Context, accessUUID string) (err error) { return err } -func AddOperateEventDetail(db *dao.DaoDB, ctx *jxcontext.Context, operateEventDetail *model.OperateEventDetail) (err error) { - if ctx.GetUserName() == "jxadmin" { - return err - } +func AddOperateEventDetail(db *dao.DaoDB, operateEventDetail *model.OperateEventDetail) (err error) { dao.Begin(db) defer func() { if r := recover(); r != nil { From 5488e459f99701ad1aa05d2f6373ae1a8cc9f6b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Fri, 17 Jan 2020 10:56:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=AA=8C=E8=AF=81cookie=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=BE=8E=E5=9B=A2=E9=85=8D=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/event/event.go | 91 ++++++++++++++++++--------------- business/model/dao/event.go | 5 +- 2 files changed, 53 insertions(+), 43 deletions(-) diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go index e37892552..ec9f8a3df 100644 --- a/business/jxstore/event/event.go +++ b/business/jxstore/event/event.go @@ -1,6 +1,7 @@ package event import ( + "fmt" "strings" "time" @@ -23,8 +24,9 @@ var ( ) type CheckCookie struct { - VendorID int `json:"vendorID"` - Status string `json:"status"` + VendorID int `json:"vendorID"` + VendorOrgCode string `json:"vendorOrgCode"` + Status string `json:"status"` } func AddOperateEvent(ctx *jxcontext.Context, accessUUID string) (err error) { @@ -117,53 +119,58 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool) var ( ebaiOrderID = "1577329467196263592" ebaiErr = "return not json" - // mtOrderID = "69761763472881638" - // mtStoreID = "6976176" - mtErr = "返回结果格式不正常" - jdUpcCode = "6952395700895" - jdErr = "请输入用户名" - errMsg = "" + mtStoreID = "7388603" + mtErr = "返回结果格式不正常" + jdUpcCode = "6952395700895" + jdErr = "请输入用户名" + mtpsErr = "用户未登录" + errMsg = "" ) for _, v := range vendorIDs { - var flag = false - cc := &CheckCookie{} - switch v { - case 3: - resultMap, err := api.EbaiAPI.GetStoreOrderInfo(ebaiOrderID) - if len(resultMap) < 1 && err != nil { - if strings.Contains(err.Error(), ebaiErr) { - //Cookie无效了 - errMsg += " 饿百Cookie无效了！" - flag = true - } - } - case 1: - err := api.MtwmAPI.PackagePriceUpdate("7388603", 1, 50) - if err != nil { - if strings.Contains(err.Error(), mtErr) { - errMsg += " 美团Cookie无效了！" - flag = true - } - } - 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 strings.Contains(err.Error(), jdErr) { - //Cookie无效 - errMsg += " 京东Cookie无效了！" + for _, vv := range apimanager.CurAPIManager.GetAppOrgCodeList(v) { + cc := &CheckCookie{} + var flag = false + switch v { + case model.VendorIDEBAI: + resultMap, err := api.EbaiAPI.GetStoreOrderInfo(ebaiOrderID) + if len(resultMap) < 1 && err != nil { + if strings.Contains(err.Error(), ebaiErr) { + errMsg += fmt.Sprintf(" 饿百账号:[%v]的Cookie无效了！", vv) flag = true } } + case model.VendorIDMTWM: + _, err := api.MtwmAPI.PackagePriceGet(mtStoreID) + if err != nil { + if strings.Contains(err.Error(), mtErr) { + errMsg += fmt.Sprintf(" 美团账号:[%v]的Cookie无效了！", vv) + flag = true + } + } + case model.VendorIDJD: + result, err := jd.GetAPI(vv).GetJdUpcCodeByName("", jdUpcCode, 1, 5) + if len(result) < 1 && err != nil { + if strings.Contains(err.Error(), jdErr) { + errMsg += fmt.Sprintf(" 京东账号:[%v]的Cookie无效了！", vv) + flag = true + } + } + case model.VendorIDMTPS: + err := api.MtpsAPI.GetAccountDetail() + if err != nil && strings.Contains(err.Error(), mtpsErr) { + errMsg += fmt.Sprintf(" 美团配送账号:[%v]的Cookie无效了！", vv) + flag = true + } } + cc.VendorID = v + cc.VendorOrgCode = vv + if flag { + cc.Status = "无效" + } else { + cc.Status = "有效" + } + ccList = append(ccList, cc) } - cc.VendorID = v - if flag { - cc.Status = "无效" - } else { - cc.Status = "有效" - } - ccList = append(ccList, cc) } if isAuto && len(ccList) > 0 { globals.SugarLogger.Warnf("GetCheckVendorCookie", errMsg) diff --git a/business/model/dao/event.go b/business/model/dao/event.go index 941be3e50..4b7c4bad1 100644 --- a/business/model/dao/event.go +++ b/business/model/dao/event.go @@ -77,7 +77,10 @@ func GetOperateEvents(db *DaoDB, apiFunction, name string, operateType int, skuI sql += " AND b.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")" sqlParams = append(sqlParams, storeIDs) } - sql += " LIMIT ? OFFSET ?" + sql += ` + ORDER BY a.created_at DESC + LIMIT ? OFFSET ? + ` sqlParams = append(sqlParams, pageSize, offset) Begin(db) defer Commit(db)