diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index d9f3d50ea..52f6ed65f 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -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) } } //全都排除了,换个提示 diff --git a/business/jxcallback/scheduler/defsch/defsch_afs.go b/business/jxcallback/scheduler/defsch/defsch_afs.go index c9d4478a4..bdfa7c0a6 100644 --- a/business/jxcallback/scheduler/defsch/defsch_afs.go +++ b/business/jxcallback/scheduler/defsch/defsch_afs.go @@ -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 } diff --git a/business/model/store.go b/business/model/store.go index 8d3a8ab10..40660472b 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -400,6 +400,7 @@ type Store struct { BrandID int `orm:"column(brand_id)" json:"brandID"` //品牌ID IsPrintCancelOrder int `orm:"column(is_print_cancel_order)" json:"isPrintCancelOrder"` //是否打印取消订单1是/-1否 IsPrintRefundOrder int `orm:"column(is_print_refund_order)" json:"isPrintRefundOrder"` //是否打印退款订单1是/-1否 + LossOrderDelivery int `orm:"column(loss_order_delivery)" json:"loss_order_delivery"` //亏损订单是否自动发货,1/-1(默认不发货) IDCardHandBack string `orm:"size(255);column(id_card_hand_back)" json:"idCardHandBack"` //手持身份证背面 PackageSetting int `orm:"size(8);column(package_setting);default(0)" json:"packageSetting"` //门店包装袋扣费设置 PackageSwitch int `orm:"size(8);column(package_switch);default(0)" json:"packageSwitch"` //物料购物单门店购买袋子开关[0打开/1关闭] diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index 1ab030ea8..e0ec48443 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -271,7 +271,7 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, } func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { - return nil, err + return c.PrintOrder(ctx, store, storeDetail, order, "order", nil) } // PrintStore 打印门店