diff --git a/business/partner/printer/jxprint/jxprint_const.go b/business/partner/printer/jxprint/jxprint_const.go index b9aafd96b..7737c2ef2 100644 --- a/business/partner/printer/jxprint/jxprint_const.go +++ b/business/partner/printer/jxprint/jxprint_const.go @@ -39,15 +39,15 @@ const ( PrintNumber = "printNumber" // 打印次数 AppID = "appId" // 应用id // 状态对应打印设置的变化 - OrderStatus = "orderStatus" // 订单状态 - WayBillStatus = "wayBillStatus" // 运单状态 - StoreStatusPrint = "storeStatus" // 门店状态 - RiderVendorIdPrint = "riderVendorId" // 骑手所属平台id - RiderNamePrint = "riderName" // 骑手名称 - RiderPhonePrint = "riderPhone" // 骑手电话 - RejectionReasonPrint = "rejectionReason" // 拒收原因 - CustcareRefundReasonPrint = "custcareRefundReason" // 客服退款理由 - EnterTheStorePrint = "enterTheStore" // 进店 + OrderStatus = "orderStatus" // 订单状态 + WayBillStatus = "wayBillStatus" // 运单状态 + StoreStatus = "storeStatus" // 门店状态 + RiderVendorId = "riderVendorId" // 骑手所属平台id + RiderName = "riderName" // 骑手名称 + RiderPhone = "riderPhone" // 骑手电话 + RejectionReason = "rejectionReason" // 拒收原因 + CustcareRefundReason = "custcareRefundReason" // 客服退款理由 + EnterTheStore = "enterTheStore" // 进店 ) type SkuListPrintOrder struct { @@ -111,38 +111,38 @@ func ManagerOrderPrint(order *model.GoodsOrder, storeTel string, storeDetail *da } // ManageWayBillPrint 组装运单打印数据 -func ManageWayBillPrint(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string { - printOrder := make(map[string]string, 0) - // 获取品牌名称 - if storeDetail != nil && storeDetail.BrandIsPrint == model.NO { - if order.VendorOrgCode == "34665" { - printOrder[EBailOrderNo] = globals.StoreNameEbai2 - } else { - printOrder[EBailOrderNo] = storeDetail.BrandName - } - } - - printOrder[VendOrID] = utils.Int2Str(order.VendorID) - printOrder[VendorName] = jxutils.GetVendorName(order.VendorID) - printOrder[StoreName] = order.StoreName - printOrder[StoreTel] = storeTel - printOrder[OfficialName] = globals.StoreName - return printOrder -} - -// ManagerStore 送达提示数据组装 -func ManagerStore(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string { - printOrder := make(map[string]string, 0) - printOrder[OrderNo] = order.VendorOrderID - printOrder[VendorOrderNo] = utils.Int2Str(order.VendorID) - printOrder[VendorName] = jxutils.GetVendorName(order.VendorID) - printOrder[StoreName] = order.StoreName - printOrder[StoreTel] = storeTel - return printOrder -} - -// ManagerEnterTheStore 进店咨询 -func ManagerEnterTheStore(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string { - printOrder := make(map[string]string, 0) - return printOrder -} +//func ManageWayBillPrint(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string { +// printOrder := make(map[string]string, 0) +// // 获取品牌名称 +// if storeDetail != nil && storeDetail.BrandIsPrint == model.NO { +// if order.VendorOrgCode == "34665" { +// printOrder[EBailOrderNo] = globals.StoreNameEbai2 +// } else { +// printOrder[EBailOrderNo] = storeDetail.BrandName +// } +// } +// +// printOrder[VendOrID] = utils.Int2Str(order.VendorID) +// printOrder[VendorName] = jxutils.GetVendorName(order.VendorID) +// printOrder[StoreName] = order.StoreName +// printOrder[StoreTel] = storeTel +// printOrder[OfficialName] = globals.StoreName +// return printOrder +//} +// +//// ManagerStore 送达提示数据组装 +//func ManagerStore(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string { +// printOrder := make(map[string]string, 0) +// printOrder[OrderNo] = order.VendorOrderID +// printOrder[VendorOrderNo] = utils.Int2Str(order.VendorID) +// printOrder[VendorName] = jxutils.GetVendorName(order.VendorID) +// printOrder[StoreName] = order.StoreName +// printOrder[StoreTel] = storeTel +// return printOrder +//} +// +//// ManagerEnterTheStore 进店咨询 +//func ManagerEnterTheStore(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string { +// printOrder := make(map[string]string, 0) +// return printOrder +//}