From 7bbc5b8bb787207e163d7e0e431228a088794332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 26 Aug 2022 11:56:56 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 2 +- business/partner/purchase/ebai/callback.go | 4 ++-- business/partner/purchase/jd/act.go | 1 - business/partner/purchase/jd/store.go | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 7489ea24a..1e0d3a0fc 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -501,7 +501,7 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod } // 京西云打印机打印数据-如果门店使用京西打印机才使用如下代码块 - store, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode) + store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode) if err == nil && store.PrinterVendorID == model.VendorIDJxprint { netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil) } diff --git a/business/partner/purchase/ebai/callback.go b/business/partner/purchase/ebai/callback.go index 0af4a941b..4fdcc5b3e 100644 --- a/business/partner/purchase/ebai/callback.go +++ b/business/partner/purchase/ebai/callback.go @@ -36,8 +36,8 @@ func OnCallbackMsg(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse } else if msg.Cmd == ebaiapi.CmdShopUnbindMsg { // 门店授权发生变化 17,失去授权 vendorStoreID := msg.Body["shop_list"].([]*ebaiapi.EBaiShopList)[0].ShopID - storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreID, model.VendorIDEBAI, "") - _, err := netprinter.PrintStoreStatus(jxcontext.AdminCtx, storeDetail, model.VendorIDMTWM, -9) + storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreID, model.VendorIDEBAI, "") + _, err = netprinter.PrintStoreStatus(jxcontext.AdminCtx, storeDetail, model.VendorIDMTWM, -9) response = api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, msg.Cmd) } } diff --git a/business/partner/purchase/jd/act.go b/business/partner/purchase/jd/act.go index 8deddc910..a3a6d4397 100644 --- a/business/partner/purchase/jd/act.go +++ b/business/partner/purchase/jd/act.go @@ -283,7 +283,6 @@ func (c *PurchaseHandler) SyncAct(ctx *jxcontext.Context, parentTask tasksch.ITa if actSkuCount == toDelActSkuCount { act.SyncStatus |= model.SyncFlagDeletedMask } - fmt.Println("3333333333333333333333,", actSkuCount, toDelActSkuCount) db := dao.GetDB() err = func() (err error) { if model.IsSyncStatusDelete(act.SyncStatus) { diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go index ca338b158..1d52598a5 100644 --- a/business/partner/purchase/jd/store.go +++ b/business/partner/purchase/jd/store.go @@ -336,8 +336,8 @@ func (c *PurchaseHandler) OnStoreMsg(vendorOrgCode string, msg *jdapi.CallbackOr if storeStatus, err = c.GetStoreStatus(jxcontext.AdminCtx, vendorOrgCode, 0, vendorStoreID); err == nil { err = partner.CurStoreManager.OnStoreStatusChanged(vendorStoreID, model.VendorIDJD, storeStatus) - storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreID, model.VendorIDEBAI, "") - netprinter.PrintStoreStatus(jxcontext.AdminCtx, storeDetail, model.VendorIDMTWM, -9) + storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreID, model.VendorIDJD, "") + netprinter.PrintStoreStatus(jxcontext.AdminCtx, storeDetail, model.VendorIDJD, -9) } else { // 可能在门店删除的情况下会出查不到门店的错误 if errExt, ok := err.(*utils.ErrorWithCode); ok && errExt.IntCode() == 4 {