diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 34ef17d53..a69bd8b2a 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1769,7 +1769,7 @@ func ExportShopsHealthInfo(ctx *jxcontext.Context, vendorIDs, storeIDs []int, is func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { switch step { case 0: - subTask := tasksch.NewParallelTask(fmt.Sprintf("ExportShopHealthInfo2[%s]", model.VendorChineseNames[vendorID]), tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx, + subTask := tasksch.NewParallelTask(fmt.Sprintf("ExportShopHealthInfo2[%s]", model.VendorChineseNames[vendorID]), tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { storeMap := batchItemList[0].(*model.StoreMap) healthInfo, err := ebai.CurPurchaseHandler.GetShopHealthInfo(storeMap.VendorStoreID) diff --git a/business/jxutils/jxutils_cms.go b/business/jxutils/jxutils_cms.go index 1f4b50e60..e6d99ceba 100644 --- a/business/jxutils/jxutils_cms.go +++ b/business/jxutils/jxutils_cms.go @@ -504,8 +504,10 @@ func GetVendorName(vendorID int) (vendorName string) { func CaculateSkuEarningPrice(shopPrice, salePrice int64, storePayPercentage int) (earningPrice int64) { earningPrice = salePrice - if salePrice == 0 || shopPrice > 0 && shopPrice < earningPrice { - earningPrice = shopPrice + if salePrice != 0 { + if shopPrice > 0 && shopPrice < earningPrice { + earningPrice = shopPrice + } } storePayPercentage = ConstrainPayPercentage(storePayPercentage) if storePayPercentage <= 0 {