+ PrintOrder

+ GetPrinterStatus
This commit is contained in:
gazebo
2019-04-01 23:29:47 +08:00
parent d1d056077d
commit 60de9f64bd
6 changed files with 186 additions and 109 deletions

View File

@@ -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
}