liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2024-12-31 09:19:36 +08:00
parent 45ed207137
commit dcff9513b9
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxstore/cms/store_sku.go
View File

@@ -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 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对分位向下取整（完成四舍五入的方法） unitPrice = int(math.Floor(float64(unitPrice)*scaleFactor/10+0.5)) * 10 //四舍五入 价格为100倍 角分为十位个位 除以10 + 0.5对分位向下取整（完成四舍五入的方法）
for _, v := range allBinds { for _, v := range allBinds {
if v.Stock == 0 { if v.Stock == 0 && beego.BConfig.RunMode != model.ServerTypePet {
v.Stock = model.MaxStoreSkuStockQty v.Stock = model.MaxStoreSkuStockQty
} }
var num int64 var num int64

6
business/partner/printer/feie/feie.go
View File

@@ -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) { 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 return nil, nil
} }
if len(order.Skus) == 0 { if len(order.Skus) == 0 {

6
controllers/cms_store_sku.go
View File

@@ -3,13 +3,10 @@ package controllers
import ( import (
"errors" "errors"
"git.rosy.net.cn/baseapi/platformapi/jdapi" "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/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/jxstore/cms"
"git.rosy.net.cn/jx-callback/business/jxutils" "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" "git.rosy.net.cn/jx-callback/business/model/dao"
"github.com/astaxie/beego/server/web" "github.com/astaxie/beego/server/web"
) )
@@ -1030,7 +1027,6 @@ func (c *StoreSkuController) GetVendorStoreSkus() {
func (c *StoreSkuController) GetStoresSkusForStore() { func (c *StoreSkuController) GetStoresSkusForStore() {
c.callGetStoresSkusForStore(func(params *tStoreSkuGetStoresSkusForStoreParams) (retVal interface{}, errCode string, err error) { 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) 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 return retVal, "", err
}) })
} }