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

1

Browse Source
This commit is contained in:
邹宗楠
2024-09-09 14:14:07 +08:00
parent 1f97956850
commit 51eee1c3d5
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -937,12 +937,12 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
if order.EarningType == model.EarningTypeQuote && order.VendorID != model.VendorIDTaoVegetable && order.VendorID != model.VendorIDDD { // 淘宝,抖店 是第二天更新结算信息的
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 <= -600 {
excludeVendorIDs = append(excludeVendorIDs, vendorID)
}
if deliveryFeeInfo, err := handler.Handler.GetWaybillFee(order); err == nil && deliveryFeeInfo != nil {
if order.TotalShopMoney-order.EarningPrice-deliveryFeeInfo.DeliveryFee <= -600 && storeDetail.LossOrderDelivery == -1 {
excludeVendorIDs = append(excludeVendorIDs, vendorID)
}
} else {
excludeVendorIDs = append(excludeVendorIDs, vendorID)
}
}
//全都排除了，换个提示

21
business/jxcallback/scheduler/defsch/defsch_afs.go
View File

@@ -3,7 +3,6 @@ package defsch
import (
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
push "git.rosy.net.cn/jx-callback/business/jxutils/unipush"
"git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg"
"git.rosy.net.cn/jx-callback/business/model"
@@ -47,16 +46,16 @@ func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err
}
}
}
if order.Status == model.AfsOrderStatusWait4Approve || order.Status == model.AfsOrderStatusFinished || order.Status == model.AfsOrderStatusNew {
// 京西云打印机打印数据-如果门店使用京西打印机才使用如下代码块
store, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode)
if err == nil && store.PrinterVendorID == model.VendorIDJxprint && store.IsPrintCancelOrder == model.YES {
orderObj, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.VendorID)
if orderObj != nil {
netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintAfsOrder, order)
}
}
}
//if order.Status == model.AfsOrderStatusWait4Approve || order.Status == model.AfsOrderStatusFinished || order.Status == model.AfsOrderStatusNew {
// // 京西云打印机打印数据-如果门店使用京西打印机才使用如下代码块
// store, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode)
// if err == nil && store.PrinterVendorID == model.VendorIDJxprint && store.IsPrintCancelOrder == model.YES {
// orderObj, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.VendorID)
// if orderObj != nil {
// netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintAfsOrder, order)
// }
// }
//}
return err
}