diff --git a/business/jxstore/cms/store_sku_check.go b/business/jxstore/cms/store_sku_check.go index 9e73ac443..255ef7f2a 100644 --- a/business/jxstore/cms/store_sku_check.go +++ b/business/jxstore/cms/store_sku_check.go @@ -365,7 +365,7 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin //utils.Writelog("jxSkuDetailName:" + jxSkuDetailName) //jxSkuSaleStatus : 商品状态 ,skustatus 优先级高于 StoreSkuStatus jxSkuSaleStatus := jxutils.MergeSkuStatus(jxSkuInfo.Skus[0].SkuStatus, jxSkuInfo.Skus[0].StoreSkuStatus) - jxSkuSaleStatusName := GetSkuSaleStatusName(jxSkuSaleStatus) + jxSkuSaleStatusName := GetSkuSaleStatusName(jxSkuSaleStatus + 3) /*京西价格*/ jxSkuPrice := fmt.Sprintf("%.2f", float64(jxSkuInfo.Skus[0].JxPrice)/float64(100)) //jxSkuPrice := strconv.Itoa(jxSkuInfo.Skus[0].JxPrice) @@ -384,7 +384,7 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin if vendorSkuInfo != nil { vendorSkuDetailName := vendorSkuInfo.SkuList[0].SkuName - vendorSkuSaleStatusName := GetSkuSaleStatusName(vendorSkuInfo.SkuList[0].Status) + vendorSkuSaleStatusName := GetSkuSaleStatusName(vendorSkuInfo.SkuList[0].Status + 3) /* 供货商价格 */ vendorPrice := fmt.Sprintf("%.2f", float64(vendorSkuInfo.SkuList[0].StoreSkuInfo.VendorPrice)/float64(100)) isSaleStatusDiff := jxSkuSaleStatusName != vendorSkuSaleStatusName @@ -441,7 +441,7 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin if len(vendorSkuInfo.SkuList) > 0 { skuIDStr := utils.Int2Str(skuID) vendorSkuDetailName := vendorSkuInfo.SkuList[0].SkuName - vendorSkuSaleStatusName := GetSkuSaleStatusName(vendorSkuInfo.SkuList[0].Status) + vendorSkuSaleStatusName := GetSkuSaleStatusName(vendorSkuInfo.SkuList[0].Status + 3) /* 供货商价格 */ vendorPrice := fmt.Sprintf("%.2f", float64(vendorSkuInfo.SkuList[0].StoreSkuInfo.VendorPrice)/float64(100)) /* 供货商价格 */ @@ -499,10 +499,10 @@ func CompareJxAndMultiVenderDepot(ctx *jxcontext.Context, vendorMap map[int]bool vendorSkuInfoMap := filterVendorSkuInfoMap[skuid] jxSkuSaleStatus := jxSkuInfo.Status - jxSkuSaleStatusName := GetSkuSaleStatusName(jxSkuSaleStatus + 3) + jxSkuSaleStatusName := GetSkuSaleStatusName(jxSkuSaleStatus) skuIDStr := utils.Int2Str(skuid) if vendorSkuInfoMap != nil { - vendorSkuSaleStatusName := GetSkuSaleStatusName(vendorSkuInfoMap.SkuList[0].Status + 3) + vendorSkuSaleStatusName := GetSkuSaleStatusName(vendorSkuInfoMap.SkuList[0].Status) vendorSkuDetailName := vendorSkuInfoMap.SkuList[0].SkuName isSaleStatusDiff := jxSkuSaleStatusName != vendorSkuSaleStatusName isNameDiff := strings.Compare(jxSkuDetailName, vendorSkuDetailName) != 0 diff --git a/business/jxutils/tasksch/task.go b/business/jxutils/tasksch/task.go index 93fd90d11..89f407e4a 100644 --- a/business/jxutils/tasksch/task.go +++ b/business/jxutils/tasksch/task.go @@ -482,7 +482,7 @@ func (t *BaseTask) run(taskHandler func()) { } } -func SendMessage(t *BaseTask) {//基类任务 +func SendMessage(t *BaseTask) { time.Sleep(10 * time.Millisecond) // 等待GetResult中的isGetResultCalled赋值 globals.SugarLogger.Debugf("BaseTask task ID:%s, name:%s finished, isGetResultCalled:%t", t.ID, t.Name, t.isGetResultCalled) if !t.isGetResultCalled && t.parent == nil && len(GetTasks(t.ID, TaskStatusBegin, TaskStatusEnd, 24, "")) > 0 { diff --git a/business/model/sku.go b/business/model/sku.go index c6aa85847..04c154089 100644 --- a/business/model/sku.go +++ b/business/model/sku.go @@ -90,11 +90,11 @@ var ( } SkuStatusName = map[int]string{ SkuStatusDeleted: "删除", - SkuStatusDontSale: "不可售", - SkuStatusNormal: "可售", - 2: "删除", - 3: "下架", - 4: "上架", + SkuStatusDontSale: "下架", + SkuStatusNormal: "上架", + 2: "删除", + 3: "不可售", + 4: "可售", } )