This commit is contained in:
邹宗楠
2024-12-04 14:11:47 +08:00
parent 2c7dd39195
commit a4d92205fd
7 changed files with 67 additions and 54 deletions

View File

@@ -76,9 +76,10 @@ type ExcelParam struct {
// UpdateStoreSku用API调用时
type StoreSkuBindSkuInfo struct {
SkuID int `json:"skuID"`
IsSale int `json:"isSale,omitempty"` // -1不可售0忽略1可售
Stock *int `json:"stock"`
SkuID int `json:"skuID"`
IsSale int `json:"isSale,omitempty"` // -1不可售0忽略1可售
Stock *int `json:"stock"`
LocationCode string `json:"location_code"` // 物料货架码
// ElmID int64 `json:"elmID,omitempty"`
// EbaiID int64 `json:"ebaiID,omitempty"`
MtLadderBoxPrice int `json:"mtLadderBoxPrice"`
@@ -1165,7 +1166,7 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, upcs []str
t4.jd_sync_status, t4.ebai_sync_status, t4.mtwm_sync_status,t4.tao_sync_status , t4.dd_sync_status, t4.yb_sync_status, t4.jds_sync_status,
t4.jd_price, t4.ebai_price, t4.mtwm_price,t4.tao_price, t4.jx_price, t4.dd_price, t4.yb_price, t4.jds_price,
t4.jd_lock_time, t4.ebai_lock_time, t4.mtwm_lock_time,t4.tao_lock_time, t4.dd_lock_time, t4.jx_lock_time, t4.yb_lock_time, t4.jds_lock_time,
t4.status_sale_begin, t4.status_sale_end, t4.stock, t4.mt_ladder_box_price,
t4.status_sale_begin, t4.status_sale_end, t4.stock, t4.mt_ladder_box_price,t4.location_code,
t6.mid_unit_price real_mid_unit_price,
t7.unit_price audit_unit_price
` + sql
@@ -2217,6 +2218,12 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
skuBind.Stock = *inSkuBind.Stock
setStoreSkuBindStatus(skuBind, model.SyncFlagStockMask)
}
if inSkuBind.LocationCode != "" {
updateFieldMap["LocationCode"] = 1
skuBind.LocationCode = inSkuBind.LocationCode
setStoreSkuBindStatus(skuBind, model.SyncFlagStockMask)
}
if inSkuBind.MtLadderBoxPrice != 0 {
updateFieldMap["MtLadderBoxPrice"] = 1
skuBind.MtLadderBoxPrice = inSkuBind.MtLadderBoxPrice
@@ -6003,7 +6010,7 @@ func doStoreSkuAuditForGy(ctx *jxcontext.Context, storeIDs []int, skuBindInfos [
db := dao.GetDB()
for _, storeID := range storeIDs {
// stores, _ := dao.GetStoreList(db, []int{storeID}, nil, nil, nil, nil, "")
//扣点的门店改价不进审核
// 扣点的门店改价不进审核
// if len(stores) > 0 {
// if stores[0].PayPercentage <= 50 || stores[0].StoreLevel == "E" || stores[0].StoreLevel == "D" {
// globals.SugarLogger.Debugf("doStoreSkuAudit return0 storeID : %v", storeID)