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 13:57:07 +08:00
parent ab76d2daf5
commit 670661b835
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxcallback/scheduler/basesch/basesch.go
View File

@@ -165,6 +165,7 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr
// return nil, fmt.Errorf("转商家自送的订单只允许有一个有效运单，当前已经有%s运单", jxutils.GetVendorName(waybillList[0].WaybillVendorID))
// }
// }
storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, order.VendorOrgCode)
balance, _ := partner.CurStoreAcctManager.GetBrandBalance(storeDetail.BrandID)
handlerInfo := partner.GetDeliveryPlatformFromVendorID(platformVendorID)

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

@@ -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不满足发送三方配送条件或没有绑定有效的三方配送门店", order.VendorOrderID)
} else {
err = fmt.Errorf("orderID:%s所有运单失败：%s", order.VendorOrderID, errList.GetErrListAsOne().Error())
}

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

@@ -836,29 +836,28 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
if order.DeliveryType != model.OrderDeliveryTypeStoreSelf {
excludeVendorIDs = append(excludeVendorIDs, waybillVendorIDs...)
}
//全都排除了，换个提示
if len(excludeVendorIDs) == len(waybillVendorIDs) {
err = fmt.Errorf("订单配送方式不是门店自送！")
}
}
var income int64
if order.OrderPayPercentage < 50 {
income = order.TotalShopMoney * int64((order.OrderPayPercentage / 2)) / 100
} else if order.OrderPayPercentage > 50 && order.OrderPayPercentage < 100 {
income = order.TotalShopMoney - order.EarningPrice
} else if order.OrderPayPercentage == 100 {
income = order.TotalShopMoney - order.ShopPrice
}
//2020-11-16 预计收益-配送费 > 0 再发
for _, vendorID := range waybillVendorIDs {
var fee int64
handler := partner.GetDeliveryPlatformFromVendorID(vendorID)
if deliveryFeeInfo, err := handler.Handler.GetWaybillFee(order); err == nil {
if deliveryFeeInfo != nil {
if income-deliveryFeeInfo.DeliveryFee <= 0 {
excludeVendorIDs = append(excludeVendorIDs, vendorID)
if order.EarningType == model.EarningTypeQuote {
for _, vendorID := range waybillVendorIDs {
handler := partner.GetDeliveryPlatformFromVendorID(vendorID)
if deliveryFeeInfo, err := handler.Handler.GetWaybillFee(order); err == nil {
if deliveryFeeInfo != nil {
if order.TotalShopMoney-order.EarningPrice-deliveryFeeInfo.DeliveryFee <= 0 {
excludeVendorIDs = append(excludeVendorIDs, vendorID)
}
}
fee = deliveryFeeInfo.DeliveryFee
}
}
globals.SugarLogger.Debugf("count order income, vendorID: %v, income :%v , deliveryFee : %v", vendorID, income, fee)
//全都排除了，换个提示
if len(excludeVendorIDs) == len(waybillVendorIDs) {
err = fmt.Errorf("报价订单扣除配送费后预计收益小于0")
}
}
//TODO 2020-07-21 发单时间要在门店的营业时间内