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-26 10:36:34 +08:00
parent 96622d9b05
commit 001a539f93
13 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -238,15 +238,13 @@ func (c *PrinterHandler) getOrderContentByTemplate(order *model.GoodsOrder, stor
return ""
}
func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string) (printerStatus *partner.PrinterStatus, err error) {
func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string, afs *model.AfsOrder) (printerStatus *partner.PrinterStatus, err error) {
globals.SugarLogger.Debugf("jxprint PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID)
if storeDetail.PrinterVendorID != model.VendorIDJxprint {
return nil, nil
}
if len(order.Skus) == 0 {
return
}
printData := ManagerOrderPrint(order, store.Tel1, storeDetail)
printData := ManagerOrderPrint(order, store.Tel1, storeDetail, printType, afs)
//printData[BigFont] = "small"
//if store.PrinterFontSize == partner.PrinterFontSizeBig || store.PrinterFontSize == partner.PrinterFontSizeBig2 {
// printData[BigFont] = "big"

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

@@ -63,7 +63,7 @@ type SkuListPrintOrder struct {
}
// ManagerOrderPrint 京西云参数组装(订单参数)
func ManagerOrderPrint(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string {
func ManagerOrderPrint(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail, printType string, afsOrder *model.AfsOrder) map[string]string {
printOrder := make(map[string]string, 0)
skuList := make([]*SkuListPrintOrder, 0, 0)
// 获取品牌名称
@@ -122,6 +122,12 @@ func ManagerOrderPrint(order *model.GoodsOrder, storeTel string, storeDetail *da
printOrder[RiderName] = bill.CourierName
printOrder[RiderPhone] = bill.CourierMobile
}
if printType == "afs" {
printOrder[AfsOrderStatus] = utils.Int2Str(afsOrder.Status)
printOrder[RejectionReason] = afsOrder.VendorReasonType
printOrder[AfsOrderStatus] = utils.Int2Str(afsOrder.Status)
printOrder[CustcareRefundReason] = afsOrder.ReasonDesc
}
return printOrder
}