From 87b691f8ec123aa8eb1aa0a1c0d76c504658cf3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 21 Dec 2020 14:43:38 +0800 Subject: [PATCH] aa --- business/jxstore/tempop/tempop.go | 33 ++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 02ece45e5..17274af5c 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -8,8 +8,6 @@ import ( "strings" "time" - "git.rosy.net.cn/baseapi/platformapi/fnpsapi" - "git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin" "git.rosy.net.cn/jx-callback/business/partner/delivery" "github.com/360EntSecGroup-Skylar/excelize" @@ -1829,20 +1827,31 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // }) // } var ( - db = dao.GetDB() + db = dao.GetDB() + storeIDs []int ) - csList, _ := dao.GetStoreCourierList(db, nil, []int{model.VendorIDFengNiao}, model.StoreStatusAll, model.StoreAuditStatusAll) - for _, v := range csList { - stores, _ := dao.GetStoreList(db, []int{v.StoreID}, nil, nil, nil, "") - store := stores[0] - if !strings.Contains(store.Name, "京西菜市-") { - params := &fnpsapi.CreateStoreParam{ - ChainStoreCode: utils.Int2Str(v.StoreID), - ChainStoreName: "京西菜市-" + store.Name, + stores, _ := dao.GetStoreList(db, nil, nil, nil, nil, "") + for _, v := range stores { + if v.StoreLevel == "A" || v.StoreLevel == "B" || v.StoreLevel == "C" || v.StoreLevel == "D" { + if v.Status == model.StoreStatusOpened || v.Status == model.StoreStatusHaveRest { + list, err := dao.GetStoresMapList(db, []int{model.VendorIDEBAI, model.VendorIDMTWM, model.VendorIDJD, model.VendorIDJDShop}, []int{v.ID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "") + if err == nil && len(list) > 0 { + _, err = cms.UpdateOrCreateCourierStores(ctx, v.ID, false, false, false) + if err != nil { + storeIDs = append(storeIDs, v.ID) + } else { + csList, _ := dao.GetStoreCourierList(db, []int{v.ID}, []int{model.VendorIDFengNiao}, model.StoreStatusAll, model.StoreAuditStatusAll) + if len(csList) > 0 { + csList[0].Status = 0 + dao.UpdateEntity(db, csList[0], "Status") + } + } + } } - api.FnAPI.UpdateStore(params) } + } + fmt.Println("errrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr", storeIDs) return err }