From 10ad46ea295767b32cc306c07bf7c70ebc0a78e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 21 Mar 2023 17:33:26 +0800 Subject: [PATCH] 1 --- .../jxcallback/scheduler/defsch/defsch.go | 2 - business/jxstore/cms/sku.go | 64 ++++++++++--------- business/partner/printer/jxprint/jxprint.go | 3 - 3 files changed, 34 insertions(+), 35 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index c7309a44b..128b0f34b 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -378,14 +378,12 @@ func Init() { func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool, isAuto bool) (err error) { savedOrderInfo := s.loadSavedOrderFromMap(model.Order2Status(order), false) savedOrderInfo.SetOrder(order) - globals.SugarLogger.Debugf("===order========:%s", utils.Format4Output(order, false)) if order.VendorID == model.VendorIDEBAI { //饿百订单待接单的时候就推所有东西 if order.Status == model.OrderStatusWaitAccepted || order.Status == model.OrderStatusNew || order.Status >= model.OrderStatusFinishedPickup { //错序 s.resetTimer(savedOrderInfo, nil, isPending) if order.Flag&model.OrderFlagMaskFake == 0 { utils.CallFuncAsync(func() { // order = setFakeActualPayPrice(order) - globals.SugarLogger.Debugf("===order2========:%s", utils.Format4Output(order, false)) netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil) //目前暂且认为AdjustCount > 0 就是调整单 if order.AdjustCount > 0 { diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 02502243d..2b532b397 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1175,14 +1175,15 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n if skuNameExt.JdCategoryID != "" { updateOrCreate(model.VendorIDJD, nameID, skuNameExt.JdCategoryID) flag = true - } else { - handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler) - vendorCategoryId, _ := handler.GetSkuCategoryIdByName(beego.AppConfig.DefaultString("jdOrgCode", "320406"), skuNameExt.Name) - if vendorCategoryId != "" { - updateOrCreate(model.VendorIDJD, nameID, skuNameExt.JdCategoryID) - flag = true - } } + //else { + // handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler) + // vendorCategoryId, _ := handler.GetSkuCategoryIdByName(beego.AppConfig.DefaultString("jdOrgCode", "320406"), skuNameExt.Name) + // if vendorCategoryId != "" { + // updateOrCreate(model.VendorIDJD, nameID, skuNameExt.JdCategoryID) + // flag = true + // } + //} if skuNameExt.JdsCategoryID != "" { updateOrCreate(model.VendorIDJDShop, nameID, skuNameExt.JdsCategoryID) flag = true @@ -1200,27 +1201,29 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n if skuNameExt.DdCategoryID != "" { updateOrCreate(model.VendorIDDD, nameID, skuNameExt.DdCategoryID) flag = true - } else { - handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDDD).(partner.IPurchasePlatformStoreSkuHandler) - imgs := fmt.Sprintf("%s,%s,%s,%s,%s,%s", skuNameExt.DescImg, skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5) - vendorCategoryId, _ := handler.GetSkuCategoryIdByName("57939570", imgs) - if vendorCategoryId != "" { - updateOrCreate(model.VendorIDDD, nameID, skuNameExt.JdCategoryID) - flag = true - } } + //else { + // handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDDD).(partner.IPurchasePlatformStoreSkuHandler) + // imgs := fmt.Sprintf("%s,%s,%s,%s,%s,%s", skuNameExt.DescImg, skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5) + // vendorCategoryId, _ := handler.GetSkuCategoryIdByName("57939570", imgs) + // if vendorCategoryId != "" { + // updateOrCreate(model.VendorIDDD, nameID, skuNameExt.JdCategoryID) + // flag = true + // } + //} } else { if payload["jdCategoryID"] != nil { updateOrCreate(model.VendorIDJD, nameID, payload["jdCategoryID"].(string)) flag = true - } else { - handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler) - vendorCategoryId, _ := handler.GetSkuCategoryIdByName(beego.AppConfig.DefaultString("jdOrgCode", "320406"), skuNameExt.Name) - if vendorCategoryId != "" { - updateOrCreate(model.VendorIDJD, nameID, skuNameExt.JdCategoryID) - flag = true - } } + //else { + // handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler) + // vendorCategoryId, _ := handler.GetSkuCategoryIdByName(beego.AppConfig.DefaultString("jdOrgCode", "320406"), skuNameExt.Name) + // if vendorCategoryId != "" { + // updateOrCreate(model.VendorIDJD, nameID, skuNameExt.JdCategoryID) + // flag = true + // } + //} if payload["jdsCategoryID"] != nil { updateOrCreate(model.VendorIDJDShop, nameID, payload["jdsCategoryID"].(string)) flag = true @@ -1236,15 +1239,16 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n if payload["ddCategoryID"] != nil { updateOrCreate(model.VendorIDDD, nameID, payload["ddCategoryID"].(string)) flag = true - } else { - handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDDD).(partner.IPurchasePlatformStoreSkuHandler) - imgs := fmt.Sprintf("%s,%s,%s,%s,%s,%s", skuNameExt.DescImg, skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5) - vendorCategoryId, _ := handler.GetSkuCategoryIdByName("57939570", imgs) - if vendorCategoryId != "" { - updateOrCreate(model.VendorIDDD, nameID, skuNameExt.JdCategoryID) - flag = true - } } + //else { + // handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDDD).(partner.IPurchasePlatformStoreSkuHandler) + // imgs := fmt.Sprintf("%s,%s,%s,%s,%s,%s", skuNameExt.DescImg, skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5) + // vendorCategoryId, _ := handler.GetSkuCategoryIdByName("57939570", imgs) + // if vendorCategoryId != "" { + // updateOrCreate(model.VendorIDDD, nameID, skuNameExt.JdCategoryID) + // flag = true + // } + //} } } return flag diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index 2541df520..455297c95 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -265,9 +265,6 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, } orderSel := utils.Int2Str(order.VendorID) + utils.Int2Str(order.OrderSeq) - globals.SugarLogger.Debugf("=store.PrinterSN=====:%s", store.PrinterSN) - globals.SugarLogger.Debugf("=store.orderSel=====:%s", orderSel) - globals.SugarLogger.Debugf("string(orderPrint)======%s", string(orderPrint)) return c.PrintMsg(ctx, store.PrinterSN, orderSel, "", string(orderPrint)) }