添加ebai

business/jxcallback/auto_delivery/auto_delivery.go

@@ -75,7 +75,7 @@ func Init() {
 	riderListInfo = list
 }
 
-// AutoSettingFakeDelivery 抖音自动设置骑手, 推送假订单
+// AutoSettingFakeDelivery 抖音自动设置骑手(饿百), 推送假订单
 func AutoSettingFakeDelivery() {
 	db := dao.GetDB()
 

business/jxcallback/orderman/orderman_ext.go

@@ -1075,12 +1075,21 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
 	}
 	for _, v := range saleInfoMap {
 		if v.Status == model.OrderStatusFinished {
+			// 计算平台计算
 			settle, _ := dao.GetPlatformSettlement(db, storeIDList, fromTime, toTime)
 			for _, s := range settle {
 				if v.VendorID == s.VendorID {
 					v.PlatformSettlement = s.TotalShopMoney
 				}
 			}
+
+			// 计算三方配送
+			fee, _ := dao.GetPlatformDesiredFee(db, storeIDList, fromTime, toTime)
+			for _, f := range fee {
+				if v.VendorID == f.VendorID {
+					v.ActualFee = f.ActualFee
+				}
+			}
 		}
 		saleInfoList = append(saleInfoList, v)
 	}

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -94,7 +94,7 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
 					VendorWaybillID2:  "",
 					WaybillVendorID:   model.VendorJXFakeWL,
 					VendorOrderID:     order.VendorOrderID,
-					OrderVendorID:     model.VendorIDDD,
+					OrderVendorID:     order.VendorID,
 					CourierName:       courierName,
 					CourierMobile:     courierMobile,
 					Status:            model.OrderStatusNew,
@@ -108,7 +108,7 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
 					WaybillFinishedAt: utils.DefaultTimeValue,
 					StatusTime:        timeNow.Add(randTime), // 下一状态时间
 					OriginalData:      "",
-					Remark:            "自定义物流单",
+					Remark:            "自定义物流单(抖音/饿了么)",
 					VendorOrgCode:     order.VendorOrgCode,
 				}
 				err = dao.CreateEntity(dao.GetDB(), bill)
@@ -130,9 +130,9 @@ func (s *DefScheduler) canOrderCreateWaybillNormally(order *model.GoodsOrder, sa
 
 func (s *DefScheduler) isPossibleSwitch2SelfDelivery(order *model.GoodsOrder) (err error) {
 	//TODO 刷单用,之后不刷单了删除
-	if order.VendorID == model.VendorIDDD {
-		return nil
-	}
+	//if order.VendorID == model.VendorIDDD {
+	//	return nil
+	//}
 
 	if model.IsOrderDeliveryByPlatform(order) {
 		if order.Status < model.OrderStatusFinishedPickup {