From dcff9513b91826d9799485c051f31df10d97754b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 31 Dec 2024 09:19:36 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/store_sku.go | 3 +-- business/partner/printer/feie/feie.go | 6 +++++- controllers/cms_store_sku.go | 6 +----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 043899967..530e04959 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -476,7 +476,6 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b // } //} } - globals.SugarLogger.Debugf("-------skuNamesInfo := %s", utils.Format4Output(skuNamesInfo, false)) return skuNamesInfo, err } @@ -2030,7 +2029,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs } unitPrice = int(math.Floor(float64(unitPrice)*scaleFactor/10+0.5)) * 10 //四舍五入 价格为100倍 角分为十位个位 除以10 + 0.5对分位向下取整(完成四舍五入的方法) for _, v := range allBinds { - if v.Stock == 0 { + if v.Stock == 0 && beego.BConfig.RunMode != model.ServerTypePet { v.Stock = model.MaxStoreSkuStockQty } var num int64 diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go index 524ba39d7..c848d94c6 100644 --- a/business/partner/printer/feie/feie.go +++ b/business/partner/printer/feie/feie.go @@ -349,7 +349,11 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, printerSN, pri func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string, asfOrder *model.AfsOrder) (printerStatus *partner.PrinterStatus, err error) { // 这个门店只打饿了么 - if store.ID == 669264 && order.VendorID == model.VendorIDMTWM { + storeMap := map[int]int{ + 669264: 1, + //669512: 1, + } + if storeMap[store.ID] == model.YES && order.VendorID == model.VendorIDMTWM { return nil, nil } if len(order.Skus) == 0 { diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go index a4d04c69f..699641b22 100644 --- a/controllers/cms_store_sku.go +++ b/controllers/cms_store_sku.go @@ -3,13 +3,10 @@ package controllers import ( "errors" "git.rosy.net.cn/baseapi/platformapi/jdapi" - "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/auth2" - "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/globals" - "git.rosy.net.cn/jx-callback/business/jxstore/cms" "git.rosy.net.cn/jx-callback/business/jxutils" + "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "github.com/astaxie/beego/server/web" ) @@ -1030,7 +1027,6 @@ func (c *StoreSkuController) GetVendorStoreSkus() { func (c *StoreSkuController) GetStoresSkusForStore() { c.callGetStoresSkusForStore(func(params *tStoreSkuGetStoresSkusForStoreParams) (retVal interface{}, errCode string, err error) { retVal, err = cms.GetStoresSkusForStore(params.Ctx, params.StoreID, params.IsFocus, params.IsAct, params.Keyword, params.CategoryID, params.Status, params.Offset, params.PageSize, params.Stock, params.LocationCode) - globals.SugarLogger.Debugf("-------retVal := %s", utils.Format4Output(retVal, false)) return retVal, "", err }) }