From 868cce8445e3bbb2bbf65545eef112257881532e Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 23 Dec 2019 10:31:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?UpdateActPrice4StoreSkuNameNew=E4=B8=ADEarn?= =?UTF-8?q?ingPrice=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/dao/store_sku.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 1dd2452ed..712136722 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -1275,18 +1275,14 @@ func UpdateActPrice4StoreSkuNameNew(db *DaoDB, storeIDs, skuIDs []int, skuNamesI v.ActPrice = int(actStoreSku.ActualActPrice) v.ActID = actStoreSku.ActID v.ActType = actStoreSku.Type + v.EarningPrice = int(jxutils.CaculateSkuEarningPrice(int64(v.ActPrice), int64(v.ActPrice), skuName.PayPercentage)) } if actStoreSku := actStoreSkuMap4EarningPrice.GetActStoreSku(skuName.StoreID, v.SkuID, -1); actStoreSku != nil { v.EarningPrice = int(actStoreSku.EarningPrice) v.EarningActID = actStoreSku.ActID - } else { + } else if v.EarningPrice == 0 { v.EarningPrice = int(jxutils.CaculateSkuEarningPrice(int64(v.BindPrice), int64(v.BindPrice), skuName.PayPercentage)) } - - // v.RealEarningPrice = v.EarningPrice - // if v.RealEarningPrice == 0 { - // v.RealEarningPrice = int(jxutils.CaculateSkuEarningPrice(int64(v.BindPrice), int64(v.BindPrice), skuName.PayPercentage)) - // } } } else { skuName.UnitPrice = skuName.Price From c6a99d73f82895904198d0d304e11bab2930c6e4 Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 23 Dec 2019 14:46:07 +0800 Subject: [PATCH 2/2] up --- business/jxcallback/scheduler/defsch/defsch.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 4f1c53477..edc08b798 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -308,7 +308,6 @@ func init() { order.VendorID == bill.WaybillVendorID && savedOrderInfo.isDeliveryCompetition && model.IsOrderDeliveryByPlatform(order) && - order.DeliveryType != model.OrderDeliveryTypeSelfTake && isOrderCanSwitch2SelfDeliver(order) && (order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) }, @@ -329,9 +328,8 @@ func init() { order.VendorID == bill.WaybillVendorID && savedOrderInfo.isDeliveryCompetition && model.IsOrderDeliveryByPlatform(order) && - order.DeliveryType != model.OrderDeliveryTypeSelfTake && isOrderCanSwitch2SelfDeliver(order) && - (order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) + (order.Status >= model.OrderStatusAccepted && order.Status < model.OrderStatusEndBegin) // 运单与订单时间有错序的情况，放开订单条件至OrderStatusAccepted }, }, //*/