From 60de9f64bdb355e6e0ddf8feee3bb221476881ca Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 1 Apr 2019 23:29:47 +0800 Subject: [PATCH] + PrintOrder + GetPrinterStatus --- .../scheduler/basesch/basesch_ext.go | 37 ---- .../jxcallback/scheduler/defsch/defsch.go | 3 +- business/jxutils/jxutils.go | 70 -------- business/jxutils/netprinter/netprinter.go | 159 ++++++++++++++++++ controllers/jx_order.go | 17 +- routers/commentsRouter_controllers.go | 9 + 6 files changed, 186 insertions(+), 109 deletions(-) create mode 100644 business/jxutils/netprinter/netprinter.go diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index be34a3fb5..48db51a21 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -3,9 +3,6 @@ package basesch import ( "fmt" - "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" - "git.rosy.net.cn/jx-callback/globals/api" - "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/jxutils" @@ -16,11 +13,6 @@ import ( "git.rosy.net.cn/jx-callback/globals" ) -const ( - PrintResultSuccess = 0 - PrintResultNoNetPrinter = 1 -) - func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order *model.GoodsOrder, policyHandler partner.CreateWaybillPolicy) (bills []*model.Waybill, err error) { userName := ctx.GetUserName() globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s", order.VendorOrderID, userName) @@ -122,32 +114,3 @@ func (c *BaseScheduler) GetStoreDeliveryType(order *model.GoodsOrder, storeMap * globals.SugarLogger.Debugf("GetStoreDeliveryType orderID:%s, deliveryType:%d", order.VendorOrderID, deliveryType) return deliveryType } - -func (c *BaseScheduler) PrintOrder(ctx *jxcontext.Context, vendorOrderID string, vendorID int) (printResult int, err error) { - order, err := orderman.FixedOrderManager.LoadOrder(vendorOrderID, vendorID) - if err == nil { - printResult, err = c.PrintOrderByOrder(ctx, order) - } - return printResult, err -} - -func (c *BaseScheduler) PrintOrderByOrder(ctx *jxcontext.Context, order *model.GoodsOrder) (printResult int, err error) { - globals.SugarLogger.Debugf("PrintOrderByOrder orderID:%s", order.VendorOrderID) - db := dao.GetDB() - storeDetail, err2 := dao.GetStoreDetail(db, jxutils.GetSaleStoreIDFromOrder(order), order.VendorID) - if err = err2; err == nil { - if storeDetail.PrinterSN != "" { - content := jxutils.GetFeieOrderContent(order, storeDetail.Tel1) - if _, err = api.FeieAPI.PrintMsg(storeDetail.PrinterSN, content, 1); err == nil { - printResult = PrintResultSuccess - dao.SetOrderPrintFlag(db, order.VendorOrderID, order.VendorID, true) - } - } else { - printResult = PrintResultNoNetPrinter - } - } - if err != nil { - globals.SugarLogger.Infof("PrintOrderByOrder orderID:%s failed with error:%v", order.VendorOrderID, err) - } - return printResult, err -} diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index a6d79bcc3..5f956a101 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -7,6 +7,7 @@ import ( "time" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" + "git.rosy.net.cn/jx-callback/business/jxutils/netprinter" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" @@ -150,7 +151,7 @@ func init() { } } if isAcceptIt { - sch.PrintOrderByOrder(jxcontext.AdminCtx, order) + netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order) } } return err diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go index c3e8bf86a..172050294 100644 --- a/business/jxutils/jxutils.go +++ b/business/jxutils/jxutils.go @@ -383,73 +383,3 @@ func Strings2Objs(strAndObjAddPairs ...interface{}) (err error) { } return nil } - -func GetFeieOrderContent(order *model.GoodsOrder, storeTel string) (content string) { - expectedDeliveryTime := order.ExpectedDeliveredTime - if utils.IsTimeZero(expectedDeliveryTime) { - expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour) - } - orderFmt := ` -京西菜市
-手机买菜上京西
-极速到家送惊喜 ---------------------------------
-下单时间: %s
-预计送达: %s
-订单编号: %s
-
- -%s#%d

-%s -
-客户: %s
-电话: %s
-地址: %s
-
-客户备注:
-%s
-
- -实际支付:%.2f
-
-商品明细:
-品名 数量 单价 小计 ---------------------------------
` - orderParams := []interface{}{ - utils.Time2Str(order.OrderCreatedAt), - utils.Time2Str(expectedDeliveryTime), - order.VendorOrderID, - GetVendorName(order.VendorID), - order.OrderSeq, - order.VendorOrderID, - order.ConsigneeName, - order.ConsigneeMobile, - order.ConsigneeAddress, - order.BuyerComment, - IntPrice2Standard(order.ActualPayPrice), - } - - for _, sku := range order.Skus { - orderFmt += `%s
` - orderFmt += `%10d%10.2f%10.2f
` - orderParams = append(orderParams, sku.SkuName, sku.Count, IntPrice2Standard(sku.SalePrice), IntPrice2Standard(sku.SalePrice*int64(sku.Count))) - } - orderFmt += `
-共%d种%d件商品 -
---------------------------------
-商品质量问题请联系:
 -%s:%s

-
-官方服务热线: 18011516898
-更多信息请关注官方微信: 京西菜市
-
-

--------------------------------- --------------------------------- -

-` - // http://weixin.qq.com/r/tkkDGzTERmk5rXB49xyk - orderParams = append(orderParams, order.SkuCount, order.GoodsCount, order.StoreName, storeTel) - return fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), orderParams...) -} diff --git a/business/jxutils/netprinter/netprinter.go b/business/jxutils/netprinter/netprinter.go new file mode 100644 index 000000000..88bb3cc35 --- /dev/null +++ b/business/jxutils/netprinter/netprinter.go @@ -0,0 +1,159 @@ +package netprinter + +import ( + "fmt" + "strings" + "time" + + "git.rosy.net.cn/jx-callback/business/partner" + + "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/globals" + "git.rosy.net.cn/jx-callback/globals/api" +) + +type PrinterStatus struct { + PrintResult int // 0：成功，1：没有配置网络打印机 + + // PrinterStatusUnknown = 0 + // PrinterStatusOffline = 1 + // PrinterStatusOnlineOK = 2 + // PrinterStatusOnlineAbnormal = 3 + PrinterStatus int + Printed int // 已经打印的单数 + Waiting int // 等待打印的单数，超过1一般不太正常 +} + +const ( + PrintResultSuccess = 0 + PrintResultNoNetPrinter = 1 +) + +func GetFeieOrderContent(order *model.GoodsOrder, storeTel string) (content string) { + expectedDeliveryTime := order.ExpectedDeliveredTime + if utils.IsTimeZero(expectedDeliveryTime) { + expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour) + } + orderFmt := ` +京西菜市
+手机买菜上京西
+极速到家送惊喜 +--------------------------------
+下单时间: %s
+预计送达: %s
+订单编号: %s
+
+ +%s#%d

+%s +
+客户: %s
+电话: %s
+地址: %s
+
+客户备注:
+%s
+
+ +实际支付:%.2f
+
+商品明细:
+品名 数量 单价 小计 +--------------------------------
` + orderParams := []interface{}{ + utils.Time2Str(order.OrderCreatedAt), + utils.Time2Str(expectedDeliveryTime), + order.VendorOrderID, + jxutils.GetVendorName(order.VendorID), + order.OrderSeq, + order.VendorOrderID, + order.ConsigneeName, + order.ConsigneeMobile, + order.ConsigneeAddress, + order.BuyerComment, + jxutils.IntPrice2Standard(order.ActualPayPrice), + } + + for _, sku := range order.Skus { + orderFmt += `%s
` + orderFmt += `%10d%10.2f%10.2f
` + orderParams = append(orderParams, sku.SkuName, sku.Count, jxutils.IntPrice2Standard(sku.SalePrice), jxutils.IntPrice2Standard(sku.SalePrice*int64(sku.Count))) + } + orderFmt += `
+共%d种%d件商品 +
+--------------------------------
+商品质量问题请联系:
 +%s:%s

+
+官方服务热线: 18011516898
+更多信息请关注官方微信: 京西菜市
+
+

+-------------------------------- +-------------------------------- +

+` + // http://weixin.qq.com/r/tkkDGzTERmk5rXB49xyk + orderParams = append(orderParams, order.SkuCount, order.GoodsCount, order.StoreName, storeTel) + return fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), orderParams...) +} + +func PrintOrder(ctx *jxcontext.Context, vendorOrderID string, vendorID int) (printResult *PrinterStatus, err error) { + order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID) + if err == nil { + printResult, err = PrintOrderByOrder(ctx, order) + } + return printResult, err +} + +func PrintOrderByOrder(ctx *jxcontext.Context, order *model.GoodsOrder) (printResult *PrinterStatus, err error) { + globals.SugarLogger.Debugf("PrintOrderByOrder orderID:%s", order.VendorOrderID) + store := &model.Store{} + store.ID = jxutils.GetSaleStoreIDFromOrder(order) + db := dao.GetDB() + if err = dao.GetEntity(db, store); err == nil { + if store.PrinterSN != "" { + content := GetFeieOrderContent(order, store.Tel1) + if _, err = api.FeieAPI.PrintMsg(store.PrinterSN, content, 1); err == nil { + printResult, err = getNetPrinterStatus(ctx, store.PrinterSN) + dao.SetOrderPrintFlag(db, order.VendorOrderID, order.VendorID, true) + } + } else { + printResult = &PrinterStatus{ + PrintResult: PrintResultNoNetPrinter, + } + } + } + if err != nil { + globals.SugarLogger.Infof("PrintOrderByOrder orderID:%s failed with error:%v", order.VendorOrderID, err) + } + return printResult, err +} + +func GetNetPrinterStatus(ctx *jxcontext.Context, storeID int) (printResult *PrinterStatus, err error) { + store := &model.Store{} + store.ID = storeID + db := dao.GetDB() + if err = dao.GetEntity(db, store); err == nil { + if store.PrinterSN != "" { + return getNetPrinterStatus(ctx, store.PrinterSN) + } + return &PrinterStatus{ + PrintResult: PrintResultNoNetPrinter, + }, nil + } + return nil, err +} + +func getNetPrinterStatus(ctx *jxcontext.Context, sn string) (printResult *PrinterStatus, err error) { + printResult = &PrinterStatus{} + if printResult.PrintResult, err = api.FeieAPI.QueryPrinterStatus(sn); err == nil { + printResult.Printed, printResult.Waiting, err = api.FeieAPI.QueryOrderInfoByDate(sn, time.Now()) + } + return printResult, nil +} diff --git a/controllers/jx_order.go b/controllers/jx_order.go index a6129362f..0b1014595 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -10,6 +10,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler/defsch" "git.rosy.net.cn/jx-callback/business/jxstore/misc" "git.rosy.net.cn/jx-callback/business/jxutils" + "git.rosy.net.cn/jx-callback/business/jxutils/netprinter" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals" @@ -324,7 +325,21 @@ func (c *OrderController) SetOrderPrintStatus() { // @router /PrintOrder [put] func (c *OrderController) PrintOrder() { c.callPrintOrder(func(params *tOrderPrintOrderParams) (retVal interface{}, errCode string, err error) { - retVal, err = defsch.FixedScheduler.PrintOrder(params.Ctx, params.VendorOrderID, params.VendorID) + retVal, err = netprinter.PrintOrder(params.Ctx, params.VendorOrderID, params.VendorID) + return retVal, "", err + }) +} + +// @Title 查询网络打印机状态 +// @Description 查询网络打印机状态 +// @Param token header string true "认证token" +// @Param storeID query int true "门店ID" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /GetPrinterStatus [get] +func (c *OrderController) GetPrinterStatus() { + c.callGetPrinterStatus(func(params *tOrderGetPrinterStatusParams) (retVal interface{}, errCode string, err error) { + retVal, err = netprinter.GetNetPrinterStatus(params.Ctx, params.StoreID) return retVal, "", err }) } diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index a527c2ce4..94e66eb90 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -565,6 +565,15 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"], + beego.ControllerComments{ + Method: "GetPrinterStatus", + Router: `/GetPrinterStatus`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"], beego.ControllerComments{ Method: "GetStoreOrderCountInfo",