From ffe72bcdbd4a68663ddfd4f10b63739123a3b552 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Thu, 15 Jul 2021 16:01:36 +0800
Subject: [PATCH] jxprint
---
business/partner/printer/jxprint/jxprint.go | 114 +++++++++++++++++++-
1 file changed, 113 insertions(+), 1 deletion(-)
diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go
index 54108c79a..60e8b1eb0 100644
--- a/business/partner/printer/jxprint/jxprint.go
+++ b/business/partner/printer/jxprint/jxprint.go
@@ -4,12 +4,15 @@ import (
"fmt"
"git.rosy.net.cn/baseapi/platformapi/jxprintapi"
"git.rosy.net.cn/baseapi/utils"
+ "git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/model"
"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/api"
+ "strings"
+ "time"
)
var (
@@ -29,6 +32,19 @@ func (c *PrinterHandler) GetVendorID() int {
}
func (c *PrinterHandler) PrintMsg(ctx *jxcontext.Context, id1, id2, msgTitle, msgContent string) (printerStatus *partner.PrinterStatus, err error) {
+ globals.SugarLogger.Debugf("PrintMsg id1:%s", id1)
+ if id1 != "" {
+ if globals.EnableStoreWrite {
+ _, err = api.JxPrintAPI.DoPrint(id1, msgContent, utils.Str2Int(id2))
+ }
+ if err == nil {
+ printerStatus, err = c.GetPrinterStatus(ctx, id1, "")
+ }
+ } else {
+ printerStatus = &partner.PrinterStatus{
+ PrintResult: partner.PrintResultNoPrinter,
+ }
+ }
return nil, err
}
@@ -71,8 +87,104 @@ func (c *PrinterHandler) RebindPrinter(ctx *jxcontext.Context, lastBindResult *p
return nil, fmt.Errorf("%s打印机当前不支持扫码绑定", model.VendorChineseNames[model.VendorIDJxprint])
}
+func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) (content string) {
+ expectedDeliveryTime := order.ExpectedDeliveredTime
+ if utils.IsTimeZero(expectedDeliveryTime) {
+ expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour)
+ }
+ orderParams := []interface{}{}
+ getCode := ""
+ if order.VendorID == model.VendorIDEBAI {
+ getCode = fmt.Sprintf("饿百取货码:%s
\n", jxutils.GetEbaiOrderGetCode(order))
+ }
+ orderFmt := ``
+ if storeDetail != nil {
+ if storeDetail.BrandIsPrint == model.NO {
+ orderFmt += `
+