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

aa

Browse Source
This commit is contained in:
suyl
2021-09-02 17:26:56 +08:00
parent 1d2bfb7cb7
commit d81b84f71a
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/scheduler/basesch/basesch_ext.go
View File

@@ -61,7 +61,7 @@ func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order *
} }
err = nil err = nil
} else if errList.GetErrListAsOne() == nil { } else if errList.GetErrListAsOne() == nil {
err = fmt.Errorf("orderID:%s不满足发送三方配送条件或没有绑定有效的三方配送门店", order.VendorOrderID) err = fmt.Errorf("orderID:%s订单发三方配送亏损超过6元/当前订单配送方式不是门店自送/没有绑定有效的三方配送门店", order.VendorOrderID)
} else { } else {
err = fmt.Errorf("orderID:%s所有运单失败：%s", order.VendorOrderID, errList.GetErrListAsOne().Error()) err = fmt.Errorf("orderID:%s所有运单失败：%s", order.VendorOrderID, errList.GetErrListAsOne().Error())
} }

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

@@ -853,7 +853,7 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
handler := partner.GetDeliveryPlatformFromVendorID(vendorID) handler := partner.GetDeliveryPlatformFromVendorID(vendorID)
if deliveryFeeInfo, err := handler.Handler.GetWaybillFee(order); err == nil { if deliveryFeeInfo, err := handler.Handler.GetWaybillFee(order); err == nil {
if deliveryFeeInfo != nil { if deliveryFeeInfo != nil {
if order.TotalShopMoney-order.EarningPrice-deliveryFeeInfo.DeliveryFee <= 0 { if order.TotalShopMoney-order.EarningPrice-deliveryFeeInfo.DeliveryFee <= -600 {
excludeVendorIDs = append(excludeVendorIDs, vendorID) excludeVendorIDs = append(excludeVendorIDs, vendorID)
} }
} }

2
business/jxstore/report/report.go
View File

@@ -911,8 +911,6 @@ func OrderDeliveryReport(ctx *jxcontext.Context, storeIDs, brandIDs []int, vendo
ORDER BY a.order_created_at DESC ORDER BY a.order_created_at DESC
LIMIT ? OFFSET ? LIMIT ? OFFSET ?
` `
fmt.Println(sql)
fmt.Println(sqlParams)
pageSize = jxutils.FormalizePageSize(pageSize) pageSize = jxutils.FormalizePageSize(pageSize)
sqlParams = append(sqlParams, pageSize, offset) sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := dao.Begin(db) txDB, _ := dao.Begin(db)