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:
邹宗楠
2022-08-12 14:16:55 +08:00
parent 98ff1bca54
commit 827b4f2f29
8 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxutils/netprinter/netprinter.go
View File

@@ -89,6 +89,8 @@ func PrintOrderByOrder4Store(ctx *jxcontext.Context, order *model.GoodsOrder, st
BrandIsPrint: model.NO, BrandIsPrint: model.NO,
} }
} }
bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID)
printResult, err = handler.PrintOrder(ctx, store, storeDetail, order) printResult, err = handler.PrintOrder(ctx, store, storeDetail, order)
if err == nil { if err == nil {
dao.SetOrderPrintFlag(db, ctx.GetUserName(), order.VendorOrderID, order.VendorID, true) dao.SetOrderPrintFlag(db, ctx.GetUserName(), order.VendorOrderID, order.VendorID, true)

2
business/partner/partner_printer.go
View File

@@ -62,7 +62,7 @@ type IPrinterHandler interface {
BindPrinter(ctx *jxcontext.Context, mapData map[string]interface{}) (bindResult *BindPrinterResult, err error) BindPrinter(ctx *jxcontext.Context, mapData map[string]interface{}) (bindResult *BindPrinterResult, err error)
RebindPrinter(ctx *jxcontext.Context, lastBindResult *BindPrinterResult) (bindResult *BindPrinterResult, err error) RebindPrinter(ctx *jxcontext.Context, lastBindResult *BindPrinterResult) (bindResult *BindPrinterResult, err error)
PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *PrinterStatus, err error) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string) (printerStatus *PrinterStatus, err error)
PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *PrinterStatus, err error) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *PrinterStatus, err error)
EmptyPrintList(ctx *jxcontext.Context, id1, id2 string) (err error) EmptyPrintList(ctx *jxcontext.Context, id1, id2 string) (err error)

2
business/partner/printer/feie/feie.go
View File

@@ -251,7 +251,7 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, printerSN, pri
return printerStatus, err return printerStatus, err
} }
func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string) (printerStatus *partner.PrinterStatus, err error) {
globals.SugarLogger.Debugf("feie PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID) globals.SugarLogger.Debugf("feie PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID)
if len(order.Skus) == 0 { if len(order.Skus) == 0 {
return return

18
business/partner/printer/jxprint/jxprint.go
View File

@@ -234,12 +234,12 @@ func (c *PrinterHandler) getOrderContentByTemplate(order *model.GoodsOrder, stor
return "" return ""
} }
func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string) (printerStatus *partner.PrinterStatus, err error) {
globals.SugarLogger.Debugf("jxprint PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID) globals.SugarLogger.Debugf("jxprint PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID)
if len(order.Skus) == 0 { if len(order.Skus) == 0 {
return return
} }
printData := ManagerOrderAndStore(order, store.Tel1, storeDetail) printData := ManagerOrderPrint(order, store.Tel1, storeDetail)
//printData[BigFont] = "small" //printData[BigFont] = "small"
//if store.PrinterFontSize == partner.PrinterFontSizeBig || store.PrinterFontSize == partner.PrinterFontSizeBig2 { //if store.PrinterFontSize == partner.PrinterFontSizeBig || store.PrinterFontSize == partner.PrinterFontSizeBig2 {
// printData[BigFont] = "big" // printData[BigFont] = "big"
@@ -249,9 +249,17 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store,
//if store.PrinterFontSize == partner.PrinterFontSizeBig2 || store.PrinterFontSize == partner.PrinterFontSizeNormal2 { //if store.PrinterFontSize == partner.PrinterFontSizeBig2 || store.PrinterFontSize == partner.PrinterFontSizeNormal2 {
// printData[PrintNumber] = utils.Int2Str(2) // printData[PrintNumber] = utils.Int2Str(2)
//} //}
printData[AppID] = "1000" // 菜市应用 printData[AppID] = "1000" // 菜市应用
printData[OrderStatus] = utils.Int2Str(order.Status) // 订单状态 switch printType {
printData[WayBillStatus] = order.VendorStatus // 运单状态 case "order":
printData[OrderStatus] = utils.Int2Str(order.Status) // 订单状态
case "wayBill":
printData[WayBillStatus] = order.VendorStatus // 运单状态
case "store":
printData[StoreStatus] = utils.Int2Str(store.Status) // 运单状态
case "reminder":
printData[ReminderStatus] = "1" // 催单
}
orderPrint, err := json.Marshal(printData) orderPrint, err := json.Marshal(printData)
if err != nil { if err != nil {
return nil, err return nil, err

15
business/partner/printer/jxprint/jxprint_const.go
View File

@@ -6,6 +6,7 @@ import (
"git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals"
) )
@@ -39,9 +40,11 @@ const (
PrintNumber = "printNumber" // 打印次数 PrintNumber = "printNumber" // 打印次数
AppID = "appId" // 应用id AppID = "appId" // 应用id
// 状态对应打印设置的变化 // 状态对应打印设置的变化
OrderStatus = "orderStatus" // 订单状态 OrderStatus = "orderStatus" // 订单状态
WayBillStatus = "wayBillStatus" // 运单状态 WayBillStatus = "wayBillStatus" // 运单状态
StoreStatus = "storeStatus" // 门店状态 StoreStatus = "storeStatus" // 门店状态
ReminderStatus = "reminderStatus" // 催单状态
RiderVendorId = "riderVendorId" // 骑手所属平台id RiderVendorId = "riderVendorId" // 骑手所属平台id
RiderName = "riderName" // 骑手名称 RiderName = "riderName" // 骑手名称
RiderPhone = "riderPhone" // 骑手电话 RiderPhone = "riderPhone" // 骑手电话
@@ -107,6 +110,12 @@ func ManagerOrderPrint(order *model.GoodsOrder, storeTel string, storeDetail *da
printOrder[StoreName] = order.StoreName printOrder[StoreName] = order.StoreName
printOrder[StoreTel] = storeTel printOrder[StoreTel] = storeTel
printOrder[OfficialName] = globals.StoreName printOrder[OfficialName] = globals.StoreName
bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID)
printOrder[StoreStatus] = utils.Int2Str(storeDetail.Status)
printOrder[RiderVendorId] = utils.Int2Str(bill.WaybillVendorID)
printOrder[RiderName] = bill.CourierName
printOrder[RiderPhone] = bill.CourierMobile
return printOrder return printOrder
} }

2
business/partner/printer/xiaowm/xiaowm.go
View File

@@ -292,7 +292,7 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, printerNumber,
return printerStatus, err return printerStatus, err
} }
func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string) (printerStatus *partner.PrinterStatus, err error) {
globals.SugarLogger.Debugf("xiaowm PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID) globals.SugarLogger.Debugf("xiaowm PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID)
var content string var content string
if isV500(store.PrinterSN) { if isV500(store.PrinterSN) {

2
business/partner/printer/yilianyun/yilianyun.go
View File

@@ -395,7 +395,7 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, machineCode, p
return printerStatus, err return printerStatus, err
} }
func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string) (printerStatus *partner.PrinterStatus, err error) {
globals.SugarLogger.Debugf("yilianyun PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID) globals.SugarLogger.Debugf("yilianyun PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID)
if len(order.Skus) == 0 { if len(order.Skus) == 0 {
return return

2
business/partner/printer/zhongwu/zhongwu.go
View File

@@ -219,7 +219,7 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, deviceID, devi
return printerStatus, err return printerStatus, err
} }
func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string) (printerStatus *partner.PrinterStatus, err error) {
globals.SugarLogger.Debugf("zhongwu PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID) globals.SugarLogger.Debugf("zhongwu PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID)
content := "" content := ""
if store.PrinterFontSize == partner.PrinterFontSizeBig { if store.PrinterFontSize == partner.PrinterFontSizeBig {