diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index f3e7bedad..894cd904b 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -61,7 +61,7 @@ func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order * } err = nil } else if errList.GetErrListAsOne() == nil { - err = fmt.Errorf("orderID:%s不满足发送三方配送条件或没有绑定有效的三方配送门店", order.VendorOrderID) + err = fmt.Errorf("orderID:%s订单发三方配送亏损超过6元/当前订单配送方式不是门店自送/没有绑定有效的三方配送门店", order.VendorOrderID) } else { err = fmt.Errorf("orderID:%s所有运单失败:%s", order.VendorOrderID, errList.GetErrListAsOne().Error()) } diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index eae125a94..50c55a7a9 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -853,7 +853,7 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf handler := partner.GetDeliveryPlatformFromVendorID(vendorID) if deliveryFeeInfo, err := handler.Handler.GetWaybillFee(order); err == nil { if deliveryFeeInfo != nil { - if order.TotalShopMoney-order.EarningPrice-deliveryFeeInfo.DeliveryFee <= 0 { + if order.TotalShopMoney-order.EarningPrice-deliveryFeeInfo.DeliveryFee <= -600 { excludeVendorIDs = append(excludeVendorIDs, vendorID) } } diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go index be1823490..58c2a4f73 100644 --- a/business/jxstore/report/report.go +++ b/business/jxstore/report/report.go @@ -911,8 +911,6 @@ func OrderDeliveryReport(ctx *jxcontext.Context, storeIDs, brandIDs []int, vendo ORDER BY a.order_created_at DESC LIMIT ? OFFSET ? ` - fmt.Println(sql) - fmt.Println(sqlParams) pageSize = jxutils.FormalizePageSize(pageSize) sqlParams = append(sqlParams, pageSize, offset) txDB, _ := dao.Begin(db)