diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 56b791344..ca06e95df 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -311,7 +311,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)
 				},
@@ -332,9 +331,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
 				},
 			},
 			//*/
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