diff --git a/business/jxcallback/scheduler/defsch/defsch_afs.go b/business/jxcallback/scheduler/defsch/defsch_afs.go index c0ca7a3b0..d49b1a405 100644 --- a/business/jxcallback/scheduler/defsch/defsch_afs.go +++ b/business/jxcallback/scheduler/defsch/defsch_afs.go @@ -44,7 +44,7 @@ func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err if err2 != nil { return err } - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintTypeOrder) + netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintAfsOrder) } } diff --git a/business/model/const.go b/business/model/const.go index 3b2a77ea1..e4d0230d4 100644 --- a/business/model/const.go +++ b/business/model/const.go @@ -313,6 +313,7 @@ const ( PrintTypeWayBill = "wayBill " // 京西云打印机:打印运单 PrintTypeStore = "store " // 京西云打印机:门店下线 PrintTypeEnter = "enter" // 京西云打印机:进店订单 + PrintAfsOrder = "afs" // 京西云打印机:售后 ) const ( diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index 8c76e59db..9f297fbdc 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -258,14 +258,16 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, //} printData[AppID] = "1000" // 菜市应用 switch printType { - case "order": - printData[OrderStatus] = utils.Int2Str(order.Status) // 订单状态 - case "wayBill": - printData[WayBillStatus] = order.VendorStatus // 运单状态 - case "store": - printData[StoreStatus] = utils.Int2Str(store.Status) // 门店状态 - case "enter": - printData[ReminderStatus] = "1" // 催单 + case "order": // 订单状态 + printData[OrderStatus] = utils.Int2Str(order.Status) + case "wayBill": // 运单状态 + printData[WayBillStatus] = order.VendorStatus + case "store": // 门店状态 + printData[StoreStatus] = utils.Int2Str(store.Status) + case "enter": // 催单 + printData[ReminderStatus] = "1" + case "afs": // 售后 + printData[OrderStatus] = utils.Int2Str(130) } orderPrint, err := json.Marshal(printData) if err != nil { @@ -276,6 +278,10 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, return c.PrintMsg(ctx, store.PrinterSN, orderSel, "", string(orderPrint)) } +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 +} + // PrintStore 打印门店 func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, vendorCode int) (printerStatus *partner.PrinterStatus, err error) { data := make(map[string]interface{}, 0) @@ -290,10 +296,6 @@ func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, return c.PrintMsg(ctx, store.PrinterSN, "99999", "", string(orderPrint)) } -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 -} - func (c *PrinterHandler) EmptyPrintList(ctx *jxcontext.Context, id1, id2 string) (err error) { if globals.EnableStoreWrite { err = api.JxPrintAPI.DelPrinterSeq(id1) diff --git a/business/partner/printer/jxprint/jxprint_const.go b/business/partner/printer/jxprint/jxprint_const.go index 211735e0e..00d64185b 100644 --- a/business/partner/printer/jxprint/jxprint_const.go +++ b/business/partner/printer/jxprint/jxprint_const.go @@ -44,6 +44,7 @@ const ( WayBillStatus = "wayBillStatus" // 运单状态 StoreStatus = "storeStatus" // 门店状态 ReminderStatus = "reminderStatus" // 催单状态 + AfsOrderStatus = "afsOrderStatus" // 售后 RiderVendorId = "riderVendorId" // 骑手所属平台id RiderName = "riderName" // 骑手名称