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

Merge remote-tracking branch 'origin/mark' into yonghui

Browse Source
This commit is contained in:
苏尹岚
2019-12-23 15:29:27 +08:00
parent 166f5320d3 0b35c7a932
commit a8439f38e1
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -311,7 +311,6 @@ func init() {
order.VendorID == bill.WaybillVendorID && order.VendorID == bill.WaybillVendorID &&
savedOrderInfo.isDeliveryCompetition && savedOrderInfo.isDeliveryCompetition &&
model.IsOrderDeliveryByPlatform(order) && model.IsOrderDeliveryByPlatform(order) &&
order.DeliveryType != model.OrderDeliveryTypeSelfTake &&
isOrderCanSwitch2SelfDeliver(order) && isOrderCanSwitch2SelfDeliver(order) &&
(order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) (order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin)
}, },
@@ -332,9 +331,8 @@ func init() {
order.VendorID == bill.WaybillVendorID && order.VendorID == bill.WaybillVendorID &&
savedOrderInfo.isDeliveryCompetition && savedOrderInfo.isDeliveryCompetition &&
model.IsOrderDeliveryByPlatform(order) && model.IsOrderDeliveryByPlatform(order) &&
order.DeliveryType != model.OrderDeliveryTypeSelfTake &&
isOrderCanSwitch2SelfDeliver(order) && isOrderCanSwitch2SelfDeliver(order) &&
(order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) (order.Status >= model.OrderStatusAccepted && order.Status < model.OrderStatusEndBegin) // 运单与订单时间有错序的情况，放开订单条件至OrderStatusAccepted
}, },
}, },
//*/ //*/

8
business/model/dao/store_sku.go
View File

@@ -1275,18 +1275,14 @@ func UpdateActPrice4StoreSkuNameNew(db *DaoDB, storeIDs, skuIDs []int, skuNamesI
v.ActPrice = int(actStoreSku.ActualActPrice) v.ActPrice = int(actStoreSku.ActualActPrice)
v.ActID = actStoreSku.ActID v.ActID = actStoreSku.ActID
v.ActType = actStoreSku.Type 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 { if actStoreSku := actStoreSkuMap4EarningPrice.GetActStoreSku(skuName.StoreID, v.SkuID, -1); actStoreSku != nil {
v.EarningPrice = int(actStoreSku.EarningPrice) v.EarningPrice = int(actStoreSku.EarningPrice)
v.EarningActID = actStoreSku.ActID v.EarningActID = actStoreSku.ActID
} else { } else if v.EarningPrice == 0 {
v.EarningPrice = int(jxutils.CaculateSkuEarningPrice(int64(v.BindPrice), int64(v.BindPrice), skuName.PayPercentage)) 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 { } else {
skuName.UnitPrice = skuName.Price skuName.UnitPrice = skuName.Price