From 3aff60f2d2af609a91960cd9f30c62815270a8d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 9 Aug 2022 09:37:41 +0800 Subject: [PATCH 01/24] 1 --- business/partner/printer/jxprint/jxprint.go | 4 +++- business/partner/printer/jxprint/jxprint_const.go | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index cea602ffd..4a49f77a0 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -250,7 +250,9 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, if store.PrinterFontSize == partner.PrinterFontSizeBig2 || store.PrinterFontSize == partner.PrinterFontSizeNormal2 { printData[PrintNumber] = utils.Int2Str(2) } - printData[AppID] = "1000" // 菜市应用 + printData[AppID] = "1000" // 菜市应用 + printData[OrderStatus] = utils.Int2Str(order.Status) // 订单状态 + printData[AppID] = order.VendorStatus // 运单状态 orderPrint, err := json.Marshal(printData) if err != nil { return nil, err diff --git a/business/partner/printer/jxprint/jxprint_const.go b/business/partner/printer/jxprint/jxprint_const.go index 2ef5154b2..be22cec9c 100644 --- a/business/partner/printer/jxprint/jxprint_const.go +++ b/business/partner/printer/jxprint/jxprint_const.go @@ -38,6 +38,8 @@ const ( BigFont = "bigFont" // 是否为大字体 PrintNumber = "printNumber" // 打印次数 AppID = "appId" // 应用id + OrderStatus = "orderStatus" // 订单状态 + WayBillStatus = "wayBillStatus" // 运单状态 ) type SkuListPrintOrder struct { From 75f3afd900f2de225861e710d97226ae152c66a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 9 Aug 2022 11:46:18 +0800 Subject: [PATCH 02/24] 1 --- business/partner/printer/jxprint/jxprint.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index 4a49f77a0..4c77fd7ef 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -252,7 +252,7 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, } printData[AppID] = "1000" // 菜市应用 printData[OrderStatus] = utils.Int2Str(order.Status) // 订单状态 - printData[AppID] = order.VendorStatus // 运单状态 + printData[WayBillStatus] = order.VendorStatus // 运单状态 orderPrint, err := json.Marshal(printData) if err != nil { return nil, err From f6c85867ab3ed889b342244b879517a5251653ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 11 Aug 2022 10:19:54 +0800 Subject: [PATCH 03/24] 1 --- controllers/cms_store.go | 16 ++++++++++++++++ routers/commentsRouter_controllers.go | 9 +++++++++ 2 files changed, 25 insertions(+) diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 8fc03accd..65733656b 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -151,6 +151,22 @@ func (c *StoreController) CreateStore() { }) } +// @Title 打印机授权创建京西门店(除门店名称和登录授权电话真实有效其他使用默认值) +// @Description 打印机授权创建京西门店 +// @Param payload formData string true "json数据，store对象" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /CreateStore2Print [post] +func (c *StoreController) CreateStore2Print() { + c.callCreateStore2Print(func(params *tStoreCreateStore2PrintParams) (retVal interface{}, errCode string, err error) { + store := &cms.StoreExt{} + if err = utils.UnmarshalUseNumber([]byte(params.Payload), store); err == nil { + retVal, err = cms.CreateStore(params.Ctx, store, params.Ctx.GetUserName()) + } + return retVal, "", err + }) +} + // @Title 商户创建京西门店 // @Description 商户创建京西门店 // @Param token header string true "认证token" diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 30a51f685..447ca9b00 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -2313,6 +2313,15 @@ func init() { Filters: nil, Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"], + web.ControllerComments{ + Method: "CreateStore2Print", + Router: `/CreateStore2Print`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"], web.ControllerComments{ Method: "CreateStoreByUser", From 75bd8fb887a0de9cde1ebe5d0964898b50449dd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 11 Aug 2022 16:38:20 +0800 Subject: [PATCH 04/24] 1 --- business/partner/printer/jxprint/jxprint.go | 307 +++++++++--------- .../partner/printer/jxprint/jxprint_const.go | 34 +- 2 files changed, 184 insertions(+), 157 deletions(-) diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index 4c77fd7ef..204548cb2 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -5,7 +5,6 @@ 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" @@ -13,8 +12,6 @@ import ( "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "regexp" - "strings" - "time" ) var ( @@ -88,151 +85,153 @@ func (c *PrinterHandler) RebindPrinter(ctx *jxcontext.Context, lastBindResult *p } 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 += ` - 您有新订单啦！
-
%s


- ` - if order.VendorOrgCode == "34665" { - orderParams = append(orderParams, globals.StoreNameEbai2) - } else { - orderParams = append(orderParams, storeDetail.BrandName) - } - } - } - orderFmt += ` -
手机买菜上京西

-
极速到家送惊喜

---------------------------------
-下单时间: %s
-预计送达: %s
-订单编号: %s
-
- -%s#%d
-%s
-` + getCode + - `客户: %s
-电话: %s
-地址: %s
-
-客户备注:
-%s
-
- -
-商品明细:
-品名 数量 单价 小计
---------------------------------
` - // 实际支付:%s
- orderParams = append(orderParams, - 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.IntPrice2StandardCurrencyString(order.ActualPayPrice), - ) - - for _, sku := range order.Skus { - orderFmt += `%s
` - orderFmt += `%8s%10s%10s
` - orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))) - } - orderFmt += `
-共%d种%d件商品 -
---------------------------------
-
商品质量问题请联系:

-
%s:%s

-
-更多信息请关注官方微信: %s
-
-
---------------------------------
---------------------------------
-
-` - orderParams = append(orderParams, order.SkuCount, order.GoodsCount, order.StoreName, storeTel, "京西菜市") - return fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), orderParams...) + // 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 += ` + // 您有新订单啦！
+ //
%s


+ // ` + // if order.VendorOrgCode == "34665" { + // orderParams = append(orderParams, globals.StoreNameEbai2) + // } else { + // orderParams = append(orderParams, storeDetail.BrandName) + // } + // } + // } + // orderFmt += ` + //
手机买菜上京西

+ //
极速到家送惊喜

+ //--------------------------------
+ //下单时间: %s
+ //预计送达: %s
+ //订单编号: %s
+ //
+ // + //%s#%d
+ //%s
+ //` + getCode + + // `客户: %s
+ //电话: %s
+ //地址: %s
+ //
+ //客户备注:
+ //%s
+ //
+ // + //
+ //商品明细:
+ //品名 数量 单价 小计
+ //--------------------------------
` + // // 实际支付:%s
+ // orderParams = append(orderParams, + // 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.IntPrice2StandardCurrencyString(order.ActualPayPrice), + // ) + // + // for _, sku := range order.Skus { + // orderFmt += `%s
` + // orderFmt += `%8s%10s%10s
` + // orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))) + // } + // orderFmt += `
+ //共%d种%d件商品 + //
+ //--------------------------------
+ //
商品质量问题请联系:

+ //
%s:%s

+ //
+ //更多信息请关注官方微信: %s
+ //
+ //
+ //--------------------------------
+ //--------------------------------
+ //
+ //` + // orderParams = append(orderParams, order.SkuCount, order.GoodsCount, order.StoreName, storeTel, "京西菜市") + // return fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), orderParams...) + return "" } func (c *PrinterHandler) getOrderContentByTemplate(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) (content string) { - orderFmt := "" - if storeDetail != nil { - //开头加上语音 - if storeDetail.PrinterSound != "" { - orderFmt += "" + storeDetail.PrinterSound + "
" - } - } - //把带有${}的变量换成实际值 - template := storeDetail.PrinterTemplate - regexpValues := regexpPrint.FindAllStringSubmatch(template, -1) - for _, v := range regexpValues { - switch v[0] { - case "${下单时间}": - template = strings.ReplaceAll(template, v[0], utils.Time2Str(order.OrderCreatedAt)) - case "${预计送达}": - expectedDeliveryTime := order.ExpectedDeliveredTime - if utils.IsTimeZero(expectedDeliveryTime) { - expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour) - } - template = strings.ReplaceAll(template, v[0], utils.Time2Str(expectedDeliveryTime)) - case "${订单号}": - template = strings.ReplaceAll(template, v[0], order.VendorOrderID) - case "${平台名}": - template = strings.ReplaceAll(template, v[0], jxutils.GetVendorName(order.VendorID)) - case "${订单序号}": - template = strings.ReplaceAll(template, v[0], utils.Int2Str(order.OrderSeq)) - case "${客户名}": - template = strings.ReplaceAll(template, v[0], order.ConsigneeName) - case "${客户电话}": - template = strings.ReplaceAll(template, v[0], order.ConsigneeMobile) - case "${客户地址}": - template = strings.ReplaceAll(template, v[0], order.ConsigneeAddress) - case "${备注}": - template = strings.ReplaceAll(template, v[0], order.BuyerComment) - case "${商品种数}": - template = strings.ReplaceAll(template, v[0], utils.Int2Str(order.SkuCount)) - case "${商品件数}": - template = strings.ReplaceAll(template, v[0], utils.Int2Str(order.GoodsCount)) - case "${门店名}": - template = strings.ReplaceAll(template, v[0], order.StoreName) - case "${门店电话}": - template = strings.ReplaceAll(template, v[0], storeTel) - case "${商品明细}": - skus := "" - skuParams := []interface{}{} - for i := 0; i < len(order.Skus); i++ { - skus += "%s
" - skus += "%8s%10s%10s

" - skuParams = append(skuParams, order.Skus[i].SkuName) - skuParams = append(skuParams, "x"+utils.Int2Str(order.Skus[i].Count)) - skuParams = append(skuParams, jxutils.IntPrice2StandardCurrencyString(order.Skus[i].SalePrice)) - skuParams = append(skuParams, jxutils.IntPrice2StandardCurrencyString(order.Skus[i].SalePrice*int64(order.Skus[i].Count))) - } - skus = fmt.Sprintf(skus, skuParams...) - template = strings.ReplaceAll(template, v[0], skus) - } - } - orderFmt += template - return strings.Replace(orderFmt, "\n", "", -1) + //orderFmt := "" + //if storeDetail != nil { + // //开头加上语音 + // if storeDetail.PrinterSound != "" { + // orderFmt += "" + storeDetail.PrinterSound + "
" + // } + //} + ////把带有${}的变量换成实际值 + //template := storeDetail.PrinterTemplate + //regexpValues := regexpPrint.FindAllStringSubmatch(template, -1) + //for _, v := range regexpValues { + // switch v[0] { + // case "${下单时间}": + // template = strings.ReplaceAll(template, v[0], utils.Time2Str(order.OrderCreatedAt)) + // case "${预计送达}": + // expectedDeliveryTime := order.ExpectedDeliveredTime + // if utils.IsTimeZero(expectedDeliveryTime) { + // expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour) + // } + // template = strings.ReplaceAll(template, v[0], utils.Time2Str(expectedDeliveryTime)) + // case "${订单号}": + // template = strings.ReplaceAll(template, v[0], order.VendorOrderID) + // case "${平台名}": + // template = strings.ReplaceAll(template, v[0], jxutils.GetVendorName(order.VendorID)) + // case "${订单序号}": + // template = strings.ReplaceAll(template, v[0], utils.Int2Str(order.OrderSeq)) + // case "${客户名}": + // template = strings.ReplaceAll(template, v[0], order.ConsigneeName) + // case "${客户电话}": + // template = strings.ReplaceAll(template, v[0], order.ConsigneeMobile) + // case "${客户地址}": + // template = strings.ReplaceAll(template, v[0], order.ConsigneeAddress) + // case "${备注}": + // template = strings.ReplaceAll(template, v[0], order.BuyerComment) + // case "${商品种数}": + // template = strings.ReplaceAll(template, v[0], utils.Int2Str(order.SkuCount)) + // case "${商品件数}": + // template = strings.ReplaceAll(template, v[0], utils.Int2Str(order.GoodsCount)) + // case "${门店名}": + // template = strings.ReplaceAll(template, v[0], order.StoreName) + // case "${门店电话}": + // template = strings.ReplaceAll(template, v[0], storeTel) + // case "${商品明细}": + // skus := "" + // skuParams := []interface{}{} + // for i := 0; i < len(order.Skus); i++ { + // skus += "%s
" + // skus += "%8s%10s%10s

" + // skuParams = append(skuParams, order.Skus[i].SkuName) + // skuParams = append(skuParams, "x"+utils.Int2Str(order.Skus[i].Count)) + // skuParams = append(skuParams, jxutils.IntPrice2StandardCurrencyString(order.Skus[i].SalePrice)) + // skuParams = append(skuParams, jxutils.IntPrice2StandardCurrencyString(order.Skus[i].SalePrice*int64(order.Skus[i].Count))) + // } + // skus = fmt.Sprintf(skus, skuParams...) + // template = strings.ReplaceAll(template, v[0], skus) + // } + //} + //orderFmt += template + //return strings.Replace(orderFmt, "\n", "", -1) + return "" } func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { @@ -241,15 +240,15 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, return } printData := ManagerOrderAndStore(order, store.Tel1, storeDetail) - printData[BigFont] = "small" - if store.PrinterFontSize == partner.PrinterFontSizeBig || store.PrinterFontSize == partner.PrinterFontSizeBig2 { - printData[BigFont] = "big" - } - // 打印次数 - printData[PrintNumber] = utils.Int2Str(model.YES) - if store.PrinterFontSize == partner.PrinterFontSizeBig2 || store.PrinterFontSize == partner.PrinterFontSizeNormal2 { - printData[PrintNumber] = utils.Int2Str(2) - } + //printData[BigFont] = "small" + //if store.PrinterFontSize == partner.PrinterFontSizeBig || store.PrinterFontSize == partner.PrinterFontSizeBig2 { + // printData[BigFont] = "big" + //} + //// 打印次数 + //printData[PrintNumber] = utils.Int2Str(model.YES) + //if store.PrinterFontSize == partner.PrinterFontSizeBig2 || store.PrinterFontSize == partner.PrinterFontSizeNormal2 { + // printData[PrintNumber] = utils.Int2Str(2) + //} printData[AppID] = "1000" // 菜市应用 printData[OrderStatus] = utils.Int2Str(order.Status) // 订单状态 printData[WayBillStatus] = order.VendorStatus // 运单状态 diff --git a/business/partner/printer/jxprint/jxprint_const.go b/business/partner/printer/jxprint/jxprint_const.go index be22cec9c..45cee17ae 100644 --- a/business/partner/printer/jxprint/jxprint_const.go +++ b/business/partner/printer/jxprint/jxprint_const.go @@ -38,8 +38,16 @@ const ( BigFont = "bigFont" // 是否为大字体 PrintNumber = "printNumber" // 打印次数 AppID = "appId" // 应用id - OrderStatus = "orderStatus" // 订单状态 - WayBillStatus = "wayBillStatus" // 运单状态 + // 状态对应打印设置的变化 + OrderStatus = "orderStatus" // 订单状态 + WayBillStatus = "wayBillStatus" // 运单状态 + StoreStatusPrint = "storeStatus" // 门店状态 + RiderVendorIdPrint = "riderVendorId" // 骑手所属平台id + RiderNamePrint = "riderName" // 骑手名称 + RiderPhonePrint = "riderPhone" // 骑手电话 + RejectionReasonPrint = "rejectionReason" // 拒收原因 + CustcareRefundReasonPrint = "custcareRefundReason" // 客服退款理由 + EnterTheStorePrint = "enterTheStore" // 进店 ) type SkuListPrintOrder struct { @@ -50,7 +58,27 @@ type SkuListPrintOrder struct { Upc string `json:"upc"` // 条形码 } -// ManagerOrderAndStore 京西云参数组装 +// ManagerStore 送达提示数据组装 +func ManagerStore(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 +} + +// ManagerOrderAndStore 京西云参数组装(订单参数) func ManagerOrderAndStore(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string { printOrder := make(map[string]string, 0) skuList := make([]*SkuListPrintOrder, 0, 0) From e9f22f3da771926b5f5f94ea7a474ccd96e7b298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 11 Aug 2022 17:15:21 +0800 Subject: [PATCH 05/24] 1 --- .../partner/printer/jxprint/jxprint_const.go | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/business/partner/printer/jxprint/jxprint_const.go b/business/partner/printer/jxprint/jxprint_const.go index 45cee17ae..eb105b224 100644 --- a/business/partner/printer/jxprint/jxprint_const.go +++ b/business/partner/printer/jxprint/jxprint_const.go @@ -78,8 +78,8 @@ func ManagerStore(order *model.GoodsOrder, storeTel string, storeDetail *dao.Sto return printOrder } -// ManagerOrderAndStore 京西云参数组装(订单参数) -func ManagerOrderAndStore(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string { +// ManagerOrderPrint 京西云参数组装(订单参数) +func ManagerOrderPrint(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string { printOrder := make(map[string]string, 0) skuList := make([]*SkuListPrintOrder, 0, 0) // 获取品牌名称 @@ -129,3 +129,23 @@ func ManagerOrderAndStore(order *model.GoodsOrder, storeTel string, storeDetail printOrder[OfficialName] = globals.StoreName return printOrder } + +// 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 +} From b0940df6ba0571d6bcc5f12192b485da37eb59e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 12 Aug 2022 10:24:40 +0800 Subject: [PATCH 06/24] 1 --- .../partner/printer/jxprint/jxprint_const.go | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/business/partner/printer/jxprint/jxprint_const.go b/business/partner/printer/jxprint/jxprint_const.go index eb105b224..b9aafd96b 100644 --- a/business/partner/printer/jxprint/jxprint_const.go +++ b/business/partner/printer/jxprint/jxprint_const.go @@ -58,26 +58,6 @@ type SkuListPrintOrder struct { Upc string `json:"upc"` // 条形码 } -// ManagerStore 送达提示数据组装 -func ManagerStore(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 -} - // ManagerOrderPrint 京西云参数组装(订单参数) func ManagerOrderPrint(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) map[string]string { printOrder := make(map[string]string, 0) @@ -149,3 +129,20 @@ func ManageWayBillPrint(order *model.GoodsOrder, storeTel string, storeDetail *d 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 +} From 98ff1bca547d6f9d19ec4a8dc581b3f32e5627f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 12 Aug 2022 11:27:43 +0800 Subject: [PATCH 07/24] 1 --- .../partner/printer/jxprint/jxprint_const.go | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) 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 +//} From 827b4f2f29701b5ebef9acf83cc96de1db967986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 12 Aug 2022 14:16:55 +0800 Subject: [PATCH 08/24] 1 --- business/jxutils/netprinter/netprinter.go | 2 ++ business/partner/partner_printer.go | 2 +- business/partner/printer/feie/feie.go | 2 +- business/partner/printer/jxprint/jxprint.go | 18 +++++++++++++----- .../partner/printer/jxprint/jxprint_const.go | 15 ++++++++++++--- business/partner/printer/xiaowm/xiaowm.go | 2 +- .../partner/printer/yilianyun/yilianyun.go | 2 +- business/partner/printer/zhongwu/zhongwu.go | 2 +- 8 files changed, 32 insertions(+), 13 deletions(-) diff --git a/business/jxutils/netprinter/netprinter.go b/business/jxutils/netprinter/netprinter.go index b3fe380d0..32db6f0cc 100644 --- a/business/jxutils/netprinter/netprinter.go +++ b/business/jxutils/netprinter/netprinter.go @@ -89,6 +89,8 @@ func PrintOrderByOrder4Store(ctx *jxcontext.Context, order *model.GoodsOrder, st BrandIsPrint: model.NO, } } + bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID) + printResult, err = handler.PrintOrder(ctx, store, storeDetail, order) if err == nil { dao.SetOrderPrintFlag(db, ctx.GetUserName(), order.VendorOrderID, order.VendorID, true) diff --git a/business/partner/partner_printer.go b/business/partner/partner_printer.go index e7697f3f0..bc990e5a8 100644 --- a/business/partner/partner_printer.go +++ b/business/partner/partner_printer.go @@ -62,7 +62,7 @@ type IPrinterHandler interface { BindPrinter(ctx *jxcontext.Context, mapData map[string]interface{}) (bindResult *BindPrinterResult, err error) RebindPrinter(ctx *jxcontext.Context, lastBindResult *BindPrinterResult) (bindResult *BindPrinterResult, err error) - PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *PrinterStatus, err error) + PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string) (printerStatus *PrinterStatus, err error) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *PrinterStatus, err error) EmptyPrintList(ctx *jxcontext.Context, id1, id2 string) (err error) diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go index 750f5537d..e6360a1e6 100644 --- a/business/partner/printer/feie/feie.go +++ b/business/partner/printer/feie/feie.go @@ -251,7 +251,7 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, printerSN, pri return printerStatus, err } -func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { +func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string) (printerStatus *partner.PrinterStatus, err error) { globals.SugarLogger.Debugf("feie PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID) if len(order.Skus) == 0 { return diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index 204548cb2..ea59a08e7 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -234,12 +234,12 @@ 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) (printerStatus *partner.PrinterStatus, err error) { +func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string) (printerStatus *partner.PrinterStatus, err error) { globals.SugarLogger.Debugf("jxprint PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID) if len(order.Skus) == 0 { return } - printData := ManagerOrderAndStore(order, store.Tel1, storeDetail) + printData := ManagerOrderPrint(order, store.Tel1, storeDetail) //printData[BigFont] = "small" //if store.PrinterFontSize == partner.PrinterFontSizeBig || store.PrinterFontSize == partner.PrinterFontSizeBig2 { // printData[BigFont] = "big" @@ -249,9 +249,17 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, //if store.PrinterFontSize == partner.PrinterFontSizeBig2 || store.PrinterFontSize == partner.PrinterFontSizeNormal2 { // printData[PrintNumber] = utils.Int2Str(2) //} - printData[AppID] = "1000" // 菜市应用 - printData[OrderStatus] = utils.Int2Str(order.Status) // 订单状态 - printData[WayBillStatus] = order.VendorStatus // 运单状态 + printData[AppID] = "1000" // 菜市应用 + switch printType { + case "order": + printData[OrderStatus] = utils.Int2Str(order.Status) // 订单状态 + case "wayBill": + printData[WayBillStatus] = order.VendorStatus // 运单状态 + case "store": + printData[StoreStatus] = utils.Int2Str(store.Status) // 运单状态 + case "reminder": + printData[ReminderStatus] = "1" // 催单 + } orderPrint, err := json.Marshal(printData) if err != nil { return nil, err diff --git a/business/partner/printer/jxprint/jxprint_const.go b/business/partner/printer/jxprint/jxprint_const.go index 7737c2ef2..db91815cd 100644 --- a/business/partner/printer/jxprint/jxprint_const.go +++ b/business/partner/printer/jxprint/jxprint_const.go @@ -6,6 +6,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils" "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" ) @@ -39,9 +40,11 @@ const ( PrintNumber = "printNumber" // 打印次数 AppID = "appId" // 应用id // 状态对应打印设置的变化 - OrderStatus = "orderStatus" // 订单状态 - WayBillStatus = "wayBillStatus" // 运单状态 - StoreStatus = "storeStatus" // 门店状态 + OrderStatus = "orderStatus" // 订单状态 + WayBillStatus = "wayBillStatus" // 运单状态 + StoreStatus = "storeStatus" // 门店状态 + ReminderStatus = "reminderStatus" // 催单状态 + RiderVendorId = "riderVendorId" // 骑手所属平台id RiderName = "riderName" // 骑手名称 RiderPhone = "riderPhone" // 骑手电话 @@ -107,6 +110,12 @@ func ManagerOrderPrint(order *model.GoodsOrder, storeTel string, storeDetail *da printOrder[StoreName] = order.StoreName printOrder[StoreTel] = storeTel printOrder[OfficialName] = globals.StoreName + + bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID) + printOrder[StoreStatus] = utils.Int2Str(storeDetail.Status) + printOrder[RiderVendorId] = utils.Int2Str(bill.WaybillVendorID) + printOrder[RiderName] = bill.CourierName + printOrder[RiderPhone] = bill.CourierMobile return printOrder } diff --git a/business/partner/printer/xiaowm/xiaowm.go b/business/partner/printer/xiaowm/xiaowm.go index e0d933ffb..dd91f7c20 100644 --- a/business/partner/printer/xiaowm/xiaowm.go +++ b/business/partner/printer/xiaowm/xiaowm.go @@ -292,7 +292,7 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, printerNumber, return printerStatus, err } -func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { +func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string) (printerStatus *partner.PrinterStatus, err error) { globals.SugarLogger.Debugf("xiaowm PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID) var content string if isV500(store.PrinterSN) { diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go index 99cbf896d..3199a5495 100644 --- a/business/partner/printer/yilianyun/yilianyun.go +++ b/business/partner/printer/yilianyun/yilianyun.go @@ -395,7 +395,7 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, machineCode, p return printerStatus, err } -func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { +func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string) (printerStatus *partner.PrinterStatus, err error) { globals.SugarLogger.Debugf("yilianyun PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID) if len(order.Skus) == 0 { return diff --git a/business/partner/printer/zhongwu/zhongwu.go b/business/partner/printer/zhongwu/zhongwu.go index bb74419a5..d0b0ac062 100644 --- a/business/partner/printer/zhongwu/zhongwu.go +++ b/business/partner/printer/zhongwu/zhongwu.go @@ -219,7 +219,7 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, deviceID, devi return printerStatus, err } -func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { +func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string) (printerStatus *partner.PrinterStatus, err error) { globals.SugarLogger.Debugf("zhongwu PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID) content := "" if store.PrinterFontSize == partner.PrinterFontSizeBig { From 9d80cff47dee59ed75a1bd8d309b948d9fa0edf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 12 Aug 2022 15:20:25 +0800 Subject: [PATCH 09/24] 1 --- business/jxcallback/orderman/fake_jd_order.go | 2 +- business/jxcallback/scheduler/defsch/defsch.go | 4 ++-- business/jxutils/netprinter/netprinter.go | 11 +++++------ business/model/const.go | 7 +++++++ business/partner/printer/jxprint/jxprint.go | 2 +- business/partner/printer/jxprint/jxprint_const.go | 4 ++-- business/partner/purchase/jx/localjx/order.go | 6 +++--- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/business/jxcallback/orderman/fake_jd_order.go b/business/jxcallback/orderman/fake_jd_order.go index faedd275b..f712ec9d7 100644 --- a/business/jxcallback/orderman/fake_jd_order.go +++ b/business/jxcallback/orderman/fake_jd_order.go @@ -42,7 +42,7 @@ func (c *OrderManager) notifyNewFakeJdOrder(order *model.GoodsOrder) (err error) realStoreID = storeDetail.LinkStoreID } notifyWxNewFakeJdOrder(order, realStoreID) - netprinter.PrintOrderByOrder4Store(jxcontext.AdminCtx, order, realStoreID) + netprinter.PrintOrderByOrder4Store(jxcontext.AdminCtx, order, realStoreID, "") return err } diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 781b3dd43..9091ef9f2 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -392,7 +392,7 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool, isAut if order.Flag&model.OrderFlagMaskFake == 0 { utils.CallFuncAsync(func() { // order = setFakeActualPayPrice(order) - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order) + netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder) //目前暂且认为AdjustCount > 0 就是调整单 if order.AdjustCount > 0 { weixinmsg.NotifyAdjustOrder(order) @@ -1688,7 +1688,7 @@ func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder, isAuto bool) { if order.Flag&model.OrderFlagMaskFake == 0 && order.VendorID != model.VendorIDEBAI { utils.CallFuncAsync(func() { // order = setFakeActualPayPrice(order) - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order) + netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder) //目前暂且认为AdjustCount > 0 就是调整单 if order.AdjustCount > 0 { weixinmsg.NotifyAdjustOrder(order) diff --git a/business/jxutils/netprinter/netprinter.go b/business/jxutils/netprinter/netprinter.go index 32db6f0cc..13b97e424 100644 --- a/business/jxutils/netprinter/netprinter.go +++ b/business/jxutils/netprinter/netprinter.go @@ -40,13 +40,13 @@ func PrintOrder(ctx *jxcontext.Context, vendorOrderID string, vendorID int) (pri order.StoreID = storeID order.JxStoreID = storeID } - printResult, err = PrintOrderByOrder(ctx, order) + printResult, err = PrintOrderByOrder(ctx, order, "") } return printResult, err } -func PrintOrderByOrder(ctx *jxcontext.Context, order *model.GoodsOrder) (printResult *partner.PrinterStatus, err error) { - return PrintOrderByOrder4Store(ctx, order, jxutils.GetSaleStoreIDFromOrder(order)) +func PrintOrderByOrder(ctx *jxcontext.Context, order *model.GoodsOrder, printType string) (printResult *partner.PrinterStatus, err error) { + return PrintOrderByOrder4Store(ctx, order, jxutils.GetSaleStoreIDFromOrder(order), printType) } func getStore4Print(db *dao.DaoDB, storeID int) (store *model.Store, err error) { @@ -71,7 +71,7 @@ func getStore4Print(db *dao.DaoDB, storeID int) (store *model.Store, err error) } // PrintOrderByOrder4Store 打印订单信息 -func PrintOrderByOrder4Store(ctx *jxcontext.Context, order *model.GoodsOrder, storeID int) (printResult *partner.PrinterStatus, err error) { +func PrintOrderByOrder4Store(ctx *jxcontext.Context, order *model.GoodsOrder, storeID int, printType string) (printResult *partner.PrinterStatus, err error) { globals.SugarLogger.Debugf("PrintOrderByOrder4Store orderID:%s", order.VendorOrderID) db := dao.GetDB() store, err := getStore4Print(db, storeID) @@ -89,9 +89,8 @@ func PrintOrderByOrder4Store(ctx *jxcontext.Context, order *model.GoodsOrder, st BrandIsPrint: model.NO, } } - bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID) - printResult, err = handler.PrintOrder(ctx, store, storeDetail, order) + printResult, err = handler.PrintOrder(ctx, store, storeDetail, order, printType) if err == nil { dao.SetOrderPrintFlag(db, ctx.GetUserName(), order.VendorOrderID, order.VendorID, true) } diff --git a/business/model/const.go b/business/model/const.go index 0089be0f6..908d3b555 100644 --- a/business/model/const.go +++ b/business/model/const.go @@ -308,6 +308,13 @@ const ( OperateCopyStoreSkus = 3 //复制门店商品 ) +const ( + PrintTypeOrder = "order" // 京西云打印机:打印订单 + PrintTypeWayBill = "wayBill " // 京西云打印机:打印运单 + PrintTypeStore = "store " // 京西云打印机:门店下线 + PrintTypeEnter = "enter" // 京西云打印机:进店订单 +) + const ( WaybillStatusRefuseFailedGetGoods = -70 WaybillStatusUnknown = 0 diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index ea59a08e7..c6d77f592 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -257,7 +257,7 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, printData[WayBillStatus] = order.VendorStatus // 运单状态 case "store": printData[StoreStatus] = utils.Int2Str(store.Status) // 运单状态 - case "reminder": + case "enter": printData[ReminderStatus] = "1" // 催单 } orderPrint, err := json.Marshal(printData) diff --git a/business/partner/printer/jxprint/jxprint_const.go b/business/partner/printer/jxprint/jxprint_const.go index db91815cd..3c8e3a1fc 100644 --- a/business/partner/printer/jxprint/jxprint_const.go +++ b/business/partner/printer/jxprint/jxprint_const.go @@ -50,7 +50,7 @@ const ( RiderPhone = "riderPhone" // 骑手电话 RejectionReason = "rejectionReason" // 拒收原因 CustcareRefundReason = "custcareRefundReason" // 客服退款理由 - EnterTheStore = "enterTheStore" // 进店 + EnterTheStore = "enterTheStore" // 催单 ) type SkuListPrintOrder struct { @@ -112,7 +112,7 @@ func ManagerOrderPrint(order *model.GoodsOrder, storeTel string, storeDetail *da printOrder[OfficialName] = globals.StoreName bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID) - printOrder[StoreStatus] = utils.Int2Str(storeDetail.Status) + //printOrder[StoreStatus] = utils.Int2Str(storeDetail.Status) printOrder[RiderVendorId] = utils.Int2Str(bill.WaybillVendorID) printOrder[RiderName] = bill.CourierName printOrder[RiderPhone] = bill.CourierMobile diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index ccb796527..c9ac94033 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -562,7 +562,7 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) { if order.OrderType != model.OrderTypeNormal { // if order.FromStoreID != 0 { if order.OrderType != model.OrderTypeDefendPrice { - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order) + netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder) } PickupGoods(order, false, "jxadmin") // } @@ -605,7 +605,7 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) { if err != nil { return err } - partner.CurStoreAcctManager.InsertBrandBill(jxcontext.AdminCtx, storeBrandId, storeOrder.ActualPayPrice, model.BrandBillFeeTypeSys, model.BrandBillFeeTypeSys, "","") + partner.CurStoreAcctManager.InsertBrandBill(jxcontext.AdminCtx, storeBrandId, storeOrder.ActualPayPrice, model.BrandBillFeeTypeSys, model.BrandBillFeeTypeSys, "", "") } } case model.PayTypeTL_BrandBillCharge: @@ -616,7 +616,7 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) { brandOrder.OrderFinishedAt = time.Now() brandOrder.Status = model.OrderStatusFinished if _, err = dao.UpdateEntity(dao.GetDB(), brandOrder, "OrderFinishedAt", "Status"); err == nil { - partner.CurStoreAcctManager.InsertBrandBill(jxcontext.AdminCtx, brandOrder.BrandID, brandOrder.ActualPayPrice, model.BrandBillTypeIncome, model.BrandBillFeeTypeCharge, orderPay.VendorOrderID,"") + partner.CurStoreAcctManager.InsertBrandBill(jxcontext.AdminCtx, brandOrder.BrandID, brandOrder.ActualPayPrice, model.BrandBillTypeIncome, model.BrandBillFeeTypeCharge, orderPay.VendorOrderID, "") } } default: From ef38526ec3d774e40af70cddb3118b2310ca8e1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 12 Aug 2022 16:17:43 +0800 Subject: [PATCH 10/24] 1 --- business/jxstore/cms/storeman.go | 5 +++++ business/partner/partner_printer.go | 1 + business/partner/printer/feie/feie.go | 4 ++++ business/partner/printer/jxprint/jxprint.go | 5 +++++ business/partner/printer/xiaowm/xiaowm.go | 4 ++++ business/partner/printer/yilianyun/yilianyun.go | 4 ++++ business/partner/printer/zhongwu/zhongwu.go | 4 ++++ 7 files changed, 27 insertions(+) diff --git a/business/jxstore/cms/storeman.go b/business/jxstore/cms/storeman.go index 9ae4955d1..3e0254122 100644 --- a/business/jxstore/cms/storeman.go +++ b/business/jxstore/cms/storeman.go @@ -5,6 +5,7 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils/ddmsg" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" + "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/business/partner" @@ -111,6 +112,10 @@ func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int, } dao.Commit(db, txDB) } + + if storeStatus < model.StoreStatusOpened && storeDetail.PrinterVendorID == model.VendorIDJxprint { + netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeStore) + } } return err } diff --git a/business/partner/partner_printer.go b/business/partner/partner_printer.go index bc990e5a8..93a825883 100644 --- a/business/partner/partner_printer.go +++ b/business/partner/partner_printer.go @@ -63,6 +63,7 @@ type IPrinterHandler interface { RebindPrinter(ctx *jxcontext.Context, lastBindResult *BindPrinterResult) (bindResult *BindPrinterResult, err error) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string) (printerStatus *PrinterStatus, err error) + PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, printType string) (printerStatus *PrinterStatus, err error) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *PrinterStatus, err error) EmptyPrintList(ctx *jxcontext.Context, id1, id2 string) (err error) diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go index e6360a1e6..b6e679b7c 100644 --- a/business/partner/printer/feie/feie.go +++ b/business/partner/printer/feie/feie.go @@ -265,6 +265,10 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, order.VendorOrderID, content) } +func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, printType string) (printerStatus *partner.PrinterStatus, err error) { + return nil, err +} + func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { return nil, err } diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index c6d77f592..9c0b95374 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -268,6 +268,11 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, return c.PrintMsg(ctx, store.PrinterSN, order.VendorOrderID, "", string(orderPrint)) } +func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, printType string) (printerStatus *partner.PrinterStatus, err error) { + + return nil, err +} + func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { return nil, err } diff --git a/business/partner/printer/xiaowm/xiaowm.go b/business/partner/printer/xiaowm/xiaowm.go index dd91f7c20..daac05208 100644 --- a/business/partner/printer/xiaowm/xiaowm.go +++ b/business/partner/printer/xiaowm/xiaowm.go @@ -307,6 +307,10 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, order.VendorOrderID, content) } +func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, printType string) (printerStatus *partner.PrinterStatus, err error) { + return nil, err +} + func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { return nil, err } diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go index 3199a5495..44ad0f0c8 100644 --- a/business/partner/printer/yilianyun/yilianyun.go +++ b/business/partner/printer/yilianyun/yilianyun.go @@ -419,6 +419,10 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, } } +func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, printType string) (printerStatus *partner.PrinterStatus, err error) { + return nil, err +} + func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { globals.SugarLogger.Debugf("yilianyun PrintCancelOrRefundOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID) if len(order.Skus) == 0 { diff --git a/business/partner/printer/zhongwu/zhongwu.go b/business/partner/printer/zhongwu/zhongwu.go index d0b0ac062..aac74990d 100644 --- a/business/partner/printer/zhongwu/zhongwu.go +++ b/business/partner/printer/zhongwu/zhongwu.go @@ -230,6 +230,10 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, order.VendorOrderID, content) } +func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, printType string) (printerStatus *partner.PrinterStatus, err error) { + return nil, err +} + func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { return nil, err } From 2f77b50a4546e2b233205114facc076f19c281e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 12 Aug 2022 16:21:04 +0800 Subject: [PATCH 11/24] 1 --- business/partner/printer/jxprint/jxprint.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index 9c0b95374..508d73f3e 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -256,7 +256,7 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, case "wayBill": printData[WayBillStatus] = order.VendorStatus // 运单状态 case "store": - printData[StoreStatus] = utils.Int2Str(store.Status) // 运单状态 + printData[StoreStatus] = utils.Int2Str(store.Status) // 门店状态 case "enter": printData[ReminderStatus] = "1" // 催单 } @@ -269,6 +269,10 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, } func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, printType string) (printerStatus *partner.PrinterStatus, err error) { + data := make(map[string]interface{}, 0) + data[StoreStatus] = utils.Int2Str(store.Status) // 门店状态 + data[StoreStatus] = utils.Int2Str(store.Status) // 门店状态 + data[StoreStatus] = utils.Int2Str(store.Status) // 门店状态 return nil, err } From 0f3b6b3a6c8da8bd2395e82f11f25febd65c92f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 16 Aug 2022 11:59:55 +0800 Subject: [PATCH 12/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=AC=E8=A5=BF?= =?UTF-8?q?=E4=BA=91=E6=89=93=E5=8D=B0=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jxcallback/scheduler/defsch/defsch.go | 7 ++++-- business/jxstore/cms/storeman.go | 3 ++- business/jxutils/netprinter/netprinter.go | 24 +++++++++++++++++++ business/partner/partner_printer.go | 2 +- business/partner/printer/feie/feie.go | 2 +- business/partner/printer/jxprint/jxprint.go | 18 ++++++++++---- business/partner/printer/xiaowm/xiaowm.go | 2 +- .../partner/printer/yilianyun/yilianyun.go | 2 +- business/partner/printer/zhongwu/zhongwu.go | 2 +- business/partner/purchase/jd/store.go | 24 +++++++++---------- business/partner/purchase/jx/localjx/order.go | 2 -- controllers/cms_store_sku.go | 2 +- 12 files changed, 62 insertions(+), 28 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 9091ef9f2..7ab965494 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -433,8 +433,7 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod statusChanged := savedOrderInfo.order == nil || savedOrderInfo.order.Status != order.Status savedOrderInfo.SetOrder(order) - if (model.IsOrderUnlockStatus(status.Status)) || - (order.LockStatus == model.OrderStatusUnknown && (status.Status > model.OrderStatusUnknown || status.Status == model.OrderStatusRefuseFailedGetGoods)) { // 只处理状态转换，一般消息不处理 + if (model.IsOrderUnlockStatus(status.Status)) || (order.LockStatus == model.OrderStatusUnknown && (status.Status > model.OrderStatusUnknown || status.Status == model.OrderStatusRefuseFailedGetGoods)) { // 只处理状态转换，一般消息不处理 if status.Status == model.OrderStatusRefuseFailedGetGoods && order.Status != model.OrderStatusFinishedPickup && !model.IsOrderFinalStatus(order.Status) { order.Status = model.OrderStatusFinishedPickup partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order) @@ -500,6 +499,7 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod } msghub.OnKeyOrderStatusChanged(savedOrderInfo.order) } + netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder) } } return err @@ -512,6 +512,9 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo savedOrderInfo := s.loadSavedOrderFromMap(model.Waybill2Status(bill), true) order := savedOrderInfo.order + // 打印通知 + netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder) + // 获取订单配送平台，如果是美团则需要获取门店配置的配送方式 //isBlendWay := false //if bill.OrderVendorID == model.VendorIDMTWM { diff --git a/business/jxstore/cms/storeman.go b/business/jxstore/cms/storeman.go index 3e0254122..80bb44751 100644 --- a/business/jxstore/cms/storeman.go +++ b/business/jxstore/cms/storeman.go @@ -113,8 +113,9 @@ func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int, dao.Commit(db, txDB) } + // 打印门第离线消息 if storeStatus < model.StoreStatusOpened && storeDetail.PrinterVendorID == model.VendorIDJxprint { - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeStore) + netprinter.PrintStoreStatus(jxcontext.AdminCtx, storeDetail, vendorID) } } return err diff --git a/business/jxutils/netprinter/netprinter.go b/business/jxutils/netprinter/netprinter.go index 13b97e424..a29d95490 100644 --- a/business/jxutils/netprinter/netprinter.go +++ b/business/jxutils/netprinter/netprinter.go @@ -101,6 +101,30 @@ func PrintOrderByOrder4Store(ctx *jxcontext.Context, order *model.GoodsOrder, st return printResult, err } +// PrintStoreStatus 打印门店信息 +func PrintStoreStatus(ctx *jxcontext.Context, storeDetail *dao.StoreDetail, vendorId int) (printResult *partner.PrinterStatus, err error) { + db := dao.GetDB() + store, err := getStore4Print(db, storeDetail.ID) + if err != nil { + return &partner.PrinterStatus{ + PrintResult: partner.PrintResultNoPrinter, + }, nil + } + + handler, err := GetHandlerFromStore(store) + if err != nil { + return &partner.PrinterStatus{ + PrintResult: partner.PrintResultNoPrinter, + }, nil + } + + printResult, err = handler.PrintStore(ctx, store, storeDetail, vendorId) + if err == nil { + dao.SetOrderPrintFlag(db, ctx.GetUserName(), "store print", vendorId, true) + } + return printResult, err +} + // PrintRefundOrCancelOrder 打印退单或取消订单信息 func PrintRefundOrCancelOrder(ctx *jxcontext.Context, printType int, order *model.GoodsOrder, storeID int) (printResult *partner.PrinterStatus, err error) { db := dao.GetDB() diff --git a/business/partner/partner_printer.go b/business/partner/partner_printer.go index 93a825883..a67a20cfa 100644 --- a/business/partner/partner_printer.go +++ b/business/partner/partner_printer.go @@ -63,7 +63,7 @@ type IPrinterHandler interface { RebindPrinter(ctx *jxcontext.Context, lastBindResult *BindPrinterResult) (bindResult *BindPrinterResult, err error) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string) (printerStatus *PrinterStatus, err error) - PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, printType string) (printerStatus *PrinterStatus, err error) + PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, vendorId int) (printerStatus *PrinterStatus, err error) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *PrinterStatus, err error) EmptyPrintList(ctx *jxcontext.Context, id1, id2 string) (err error) diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go index b6e679b7c..762f462cf 100644 --- a/business/partner/printer/feie/feie.go +++ b/business/partner/printer/feie/feie.go @@ -265,7 +265,7 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, order.VendorOrderID, content) } -func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, printType string) (printerStatus *partner.PrinterStatus, err error) { +func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, vendorId int) (printerStatus *partner.PrinterStatus, err error) { return nil, err } diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index 508d73f3e..720d8427f 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -236,6 +236,9 @@ func (c *PrinterHandler) getOrderContentByTemplate(order *model.GoodsOrder, stor func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string) (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 } @@ -268,13 +271,18 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, return c.PrintMsg(ctx, store.PrinterSN, order.VendorOrderID, "", string(orderPrint)) } -func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, printType string) (printerStatus *partner.PrinterStatus, err error) { +// PrintStore 打印门店 +func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, vendorCode int) (printerStatus *partner.PrinterStatus, err error) { data := make(map[string]interface{}, 0) - data[StoreStatus] = utils.Int2Str(store.Status) // 门店状态 - data[StoreStatus] = utils.Int2Str(store.Status) // 门店状态 - data[StoreStatus] = utils.Int2Str(store.Status) // 门店状态 + data[StoreStatus] = utils.Int2Str(store.Status) + data[StoreName] = storeDetail.VendorStoreName + data[VendorName] = model.VendorChineseNames[vendorCode] + orderPrint, err := json.Marshal(data) + if err != nil { + return nil, err + } - return nil, err + return c.PrintMsg(ctx, store.PrinterSN, "", "", string(orderPrint)) } func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { diff --git a/business/partner/printer/xiaowm/xiaowm.go b/business/partner/printer/xiaowm/xiaowm.go index daac05208..eb55a87aa 100644 --- a/business/partner/printer/xiaowm/xiaowm.go +++ b/business/partner/printer/xiaowm/xiaowm.go @@ -307,7 +307,7 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, order.VendorOrderID, content) } -func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, printType string) (printerStatus *partner.PrinterStatus, err error) { +func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, vendorId int) (printerStatus *partner.PrinterStatus, err error) { return nil, err } diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go index 44ad0f0c8..104f5a301 100644 --- a/business/partner/printer/yilianyun/yilianyun.go +++ b/business/partner/printer/yilianyun/yilianyun.go @@ -419,7 +419,7 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, } } -func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, printType string) (printerStatus *partner.PrinterStatus, err error) { +func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, vendorId int) (printerStatus *partner.PrinterStatus, err error) { return nil, err } diff --git a/business/partner/printer/zhongwu/zhongwu.go b/business/partner/printer/zhongwu/zhongwu.go index aac74990d..80f582acc 100644 --- a/business/partner/printer/zhongwu/zhongwu.go +++ b/business/partner/printer/zhongwu/zhongwu.go @@ -230,7 +230,7 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, order.VendorOrderID, content) } -func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, printType string) (printerStatus *partner.PrinterStatus, err error) { +func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, vendorId int) (printerStatus *partner.PrinterStatus, err error) { return nil, err } diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go index ff0d047b3..6395df866 100644 --- a/business/partner/purchase/jd/store.go +++ b/business/partner/purchase/jd/store.go @@ -329,18 +329,18 @@ func (p *PurchaseHandler) GetStoreStatus(ctx *jxcontext.Context, vendorOrgCode s // 当前京东的storeCrud消息不会在门店状态改变时发送，所以意义不大，先放在这里 func (c *PurchaseHandler) OnStoreMsg(vendorOrgCode string, msg *jdapi.CallbackOrderMsg) (response *jdapi.CallbackResponse) { var err error - // if msg.StatusID == jdapi.StatusIDUpdateStore { - // var storeStatus int - // vendorStoreID := msg.BillID - // if storeStatus, err = c.GetStoreStatus(jxcontext.AdminCtx, vendorStoreID); err == nil { - // err = partner.CurStoreManager.OnStoreStatusChanged(vendorStoreID, model.VendorIDJD, storeStatus) - // } else { - // // 可能在门店删除的情况下会出查不到门店的错误 - // if errExt, ok := err.(*utils.ErrorWithCode); ok && errExt.IntCode() == 4 { - // err = nil - // } - // } - // } + if msg.StatusID == jdapi.StatusIDUpdateStore { + var storeStatus int + vendorStoreID := msg.BillID + if storeStatus, err = c.GetStoreStatus(jxcontext.AdminCtx, vendorOrgCode, 0, vendorStoreID); err == nil { + err = partner.CurStoreManager.OnStoreStatusChanged(vendorStoreID, model.VendorIDJD, storeStatus) + } else { + // 可能在门店删除的情况下会出查不到门店的错误 + if errExt, ok := err.(*utils.ErrorWithCode); ok && errExt.IntCode() == 4 { + err = nil + } + } + } return jdapi.Err2CallbackResponse(err, "") } diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index c9ac94033..ebc0f4f6c 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -560,12 +560,10 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) { err = callNewOrder(order) //如果是物料的订单，直接到拣货完成，配送中的状态 if order.OrderType != model.OrderTypeNormal { - // if order.FromStoreID != 0 { if order.OrderType != model.OrderTypeDefendPrice { netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder) } PickupGoods(order, false, "jxadmin") - // } } else { //普通的订单要看用没用优惠券，用了的话，要把这个用户用过的优惠券状态改了 if order.CouponIDs != "" { diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go index ade3f399a..344499a4a 100644 --- a/controllers/cms_store_sku.go +++ b/controllers/cms_store_sku.go @@ -274,7 +274,7 @@ func (c *StoreSkuController) SyncStoresSkus() { // @Param isAsync formData bool false "是否异步操作" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult -// @router /UpdateStoresSkus [put] +// @router /UpdateStoresSkus [put] func (c *StoreSkuController) UpdateStoresSkus() { c.callUpdateStoresSkus(func(params *tStoreSkuUpdateStoresSkusParams) (retVal interface{}, errCode string, err error) { var storeIDs []int From deebdd0f5b66f4acbd768f4cba7f55ddd6106eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 16 Aug 2022 14:34:00 +0800 Subject: [PATCH 13/24] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 2 +- business/jxcallback/scheduler/defsch/defsch_afs.go | 8 ++++++++ business/jxutils/netprinter/netprinter.go | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 7ab965494..cb86159f8 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -513,7 +513,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo order := savedOrderInfo.order // 打印通知 - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder) + netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeWayBill) // 获取订单配送平台，如果是美团则需要获取门店配置的配送方式 //isBlendWay := false diff --git a/business/jxcallback/scheduler/defsch/defsch_afs.go b/business/jxcallback/scheduler/defsch/defsch_afs.go index 260aec703..b3c24e506 100644 --- a/business/jxcallback/scheduler/defsch/defsch_afs.go +++ b/business/jxcallback/scheduler/defsch/defsch_afs.go @@ -3,6 +3,7 @@ package defsch import ( "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" + "git.rosy.net.cn/jx-callback/business/jxutils/netprinter" push "git.rosy.net.cn/jx-callback/business/jxutils/unipush" "git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg" "git.rosy.net.cn/jx-callback/business/model" @@ -33,6 +34,13 @@ func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err msghub.OnNewWait4ApproveAfsOrder(order) weixinmsg.NotifyAfsOrderStatus(order) push.NotifyAfsOrder(order) + + // 打印通知 + if handler := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID); handler != nil { + if orderObj, err2 := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, ""); err2 == nil && order != nil { + netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintTypeOrder) + } + } } } return err diff --git a/business/jxutils/netprinter/netprinter.go b/business/jxutils/netprinter/netprinter.go index a29d95490..59c83053e 100644 --- a/business/jxutils/netprinter/netprinter.go +++ b/business/jxutils/netprinter/netprinter.go @@ -82,6 +82,7 @@ func PrintOrderByOrder4Store(ctx *jxcontext.Context, order *model.GoodsOrder, st PrintResult: partner.PrintResultNoPrinter, }, nil } + storeDetail, _ := dao.GetStoreDetail(db, storeID, order.VendorID, order.VendorOrgCode) if storeDetail == nil && order.VendorOrderID == testVendorOrderID { storeDetail = &dao.StoreDetail{ From d30d4146ffe894791471ce8a3827c091e0547b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 17 Aug 2022 17:35:21 +0800 Subject: [PATCH 14/24] 1 --- business/model/dao/store_sku.go | 4 +++- business/model/dao/store_sku_test.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index c935f12e5..fcea71ea1 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -679,7 +679,9 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo // } sql = fmt.Sprintf(sql, fmtParams...) sql += " ORDER BY t1.price" - // globals.SugarLogger.Debug(sql) + globals.SugarLogger.Debug("sql======", sql) + globals.SugarLogger.Debug("sqlparam======", sqlParams) + if err = GetRows(db, &skus, sql, sqlParams...); err != nil { return nil, err } diff --git a/business/model/dao/store_sku_test.go b/business/model/dao/store_sku_test.go index 8a5d5ed3c..27f8118f6 100644 --- a/business/model/dao/store_sku_test.go +++ b/business/model/dao/store_sku_test.go @@ -17,7 +17,7 @@ func TestGetFullStoreSkus(t *testing.T) { } func TestGetStoreSkus(t *testing.T) { - skuList, err := GetStoreSkus(GetDB(), model.VendorIDMTWM, 100134, nil) + skuList, err := GetStoreSkus(GetDB(), model.VendorIDMTWM, 800165, []int{30969}) if err != nil { t.Fatal(err) } From 5bddb01dfaeea89a7debd75c9775fd098645fa42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 18 Aug 2022 17:17:48 +0800 Subject: [PATCH 15/24] 1 --- business/partner/printer/jxprint/jxprint.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index 720d8427f..2ff535df3 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -12,6 +12,7 @@ import ( "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "regexp" + "strings" ) var ( @@ -34,6 +35,7 @@ func (c *PrinterHandler) GetVendorID() int { func (c *PrinterHandler) PrintMsg(ctx *jxcontext.Context, printSn, orderSeq, msgTitle, msgContent string) (printerStatus *partner.PrinterStatus, err error) { globals.SugarLogger.Debugf("PrintMsg id1:%s", printSn) if printSn != "" && globals.EnableStoreWrite { + printSn = strings.Split(printSn, "_")[0] if _, err := api.JxPrintAPI.DoPrint(printSn, msgContent, utils.Str2Int(orderSeq)); err == nil { return c.GetPrinterStatus(ctx, printSn, "") } @@ -268,7 +270,8 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, return nil, err } - return c.PrintMsg(ctx, store.PrinterSN, order.VendorOrderID, "", string(orderPrint)) + orderSel := utils.Int2Str(order.VendorID) + utils.Int2Str(order.OrderSeq) + return c.PrintMsg(ctx, store.PrinterSN, orderSel, "", string(orderPrint)) } // PrintStore 打印门店 @@ -282,7 +285,7 @@ func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, return nil, err } - return c.PrintMsg(ctx, store.PrinterSN, "", "", string(orderPrint)) + return c.PrintMsg(ctx, store.PrinterSN, "99999", "", string(orderPrint)) } func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { From ccb7fef2e9561ce7d24e652c6c5b5d14026191d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 19 Aug 2022 18:26:24 +0800 Subject: [PATCH 16/24] 1 --- business/jxstore/cms/storeman.go | 2 +- business/jxutils/netprinter/netprinter.go | 6 ++++-- business/partner/purchase/mtwm/callback.go | 7 +++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/business/jxstore/cms/storeman.go b/business/jxstore/cms/storeman.go index 80bb44751..8ad0be8cb 100644 --- a/business/jxstore/cms/storeman.go +++ b/business/jxstore/cms/storeman.go @@ -115,7 +115,7 @@ func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int, // 打印门第离线消息 if storeStatus < model.StoreStatusOpened && storeDetail.PrinterVendorID == model.VendorIDJxprint { - netprinter.PrintStoreStatus(jxcontext.AdminCtx, storeDetail, vendorID) + netprinter.PrintStoreStatus(jxcontext.AdminCtx, storeDetail, vendorID, 0) } } return err diff --git a/business/jxutils/netprinter/netprinter.go b/business/jxutils/netprinter/netprinter.go index 59c83053e..bbd7f7b7d 100644 --- a/business/jxutils/netprinter/netprinter.go +++ b/business/jxutils/netprinter/netprinter.go @@ -103,7 +103,7 @@ func PrintOrderByOrder4Store(ctx *jxcontext.Context, order *model.GoodsOrder, st } // PrintStoreStatus 打印门店信息 -func PrintStoreStatus(ctx *jxcontext.Context, storeDetail *dao.StoreDetail, vendorId int) (printResult *partner.PrinterStatus, err error) { +func PrintStoreStatus(ctx *jxcontext.Context, storeDetail *dao.StoreDetail, vendorId, storeStatus int) (printResult *partner.PrinterStatus, err error) { db := dao.GetDB() store, err := getStore4Print(db, storeDetail.ID) if err != nil { @@ -118,7 +118,9 @@ func PrintStoreStatus(ctx *jxcontext.Context, storeDetail *dao.StoreDetail, vend PrintResult: partner.PrintResultNoPrinter, }, nil } - + if storeStatus != 0 { // 失去授权 + storeDetail.Status = -9 + } printResult, err = handler.PrintStore(ctx, store, storeDetail, vendorId) if err == nil { dao.SetOrderPrintFlag(db, ctx.GetUserName(), "store print", vendorId, true) diff --git a/business/partner/purchase/mtwm/callback.go b/business/partner/purchase/mtwm/callback.go index 7ad771f15..52fc6af18 100644 --- a/business/partner/purchase/mtwm/callback.go +++ b/business/partner/purchase/mtwm/callback.go @@ -3,7 +3,10 @@ package mtwm import ( "git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/jx-callback/business/jxutils" + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" + "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" ) // 美团回调接口 @@ -14,6 +17,10 @@ func OnCallbackMsg(msg *mtwmapi.CallbackMsg) (response *mtwmapi.CallbackResponse } else if msg.Cmd == mtwmapi.MsgTypePrivateNumberDowngrade { response = CurPurchaseHandler.onNumberDowngrade(msg) } else if msg.Cmd == mtwmapi.MsgTypeStoreBind { + // 门店授权发生变化 17,失去授权 + vendorStoreID := msg.FormData.Get("app_poi_code") + storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreID, model.VendorIDMTWM, "") + netprinter.PrintStoreStatus(jxcontext.AdminCtx, storeDetail, model.VendorIDMTWM, -9) } else { if orderID := GetOrderIDFromMsg(msg); orderID != "" { jxutils.CallMsgHandler(func() { From 94246af74dafc56c9f4d45f8270c706d5f4f290c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 22 Aug 2022 09:27:28 +0800 Subject: [PATCH 17/24] 1 --- business/jxutils/netprinter/netprinter.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxutils/netprinter/netprinter.go b/business/jxutils/netprinter/netprinter.go index bbd7f7b7d..ff3cfff42 100644 --- a/business/jxutils/netprinter/netprinter.go +++ b/business/jxutils/netprinter/netprinter.go @@ -119,7 +119,7 @@ func PrintStoreStatus(ctx *jxcontext.Context, storeDetail *dao.StoreDetail, vend }, nil } if storeStatus != 0 { // 失去授权 - storeDetail.Status = -9 + store.Status = -9 } printResult, err = handler.PrintStore(ctx, store, storeDetail, vendorId) if err == nil { From 479121c5ce057e7669765a21f09018c5ad8132f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 22 Aug 2022 10:56:56 +0800 Subject: [PATCH 18/24] 1 --- business/partner/purchase/ebai/callback.go | 10 ++++++++++ business/partner/purchase/mtwm/callback.go | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/ebai/callback.go b/business/partner/purchase/ebai/callback.go index b3234c88d..0af4a941b 100644 --- a/business/partner/purchase/ebai/callback.go +++ b/business/partner/purchase/ebai/callback.go @@ -4,8 +4,12 @@ import ( "git.rosy.net.cn/baseapi/platformapi/ebaiapi" "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/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" + "git.rosy.net.cn/jx-callback/globals/api" ) func OnCallbackMsg(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse) { @@ -29,6 +33,12 @@ func OnCallbackMsg(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse response = CurPurchaseHandler.OnFinancialMsg(msg) } else if msg.Cmd == ebaiapi.CmdShopMsgPush { response = CurPurchaseHandler.onShopMsgPush(msg) + } else if msg.Cmd == ebaiapi.CmdShopUnbindMsg { + // 门店授权发生变化 17,失去授权 + vendorStoreID := msg.Body["shop_list"].([]*ebaiapi.EBaiShopList)[0].ShopID + storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreID, model.VendorIDEBAI, "") + _, err := netprinter.PrintStoreStatus(jxcontext.AdminCtx, storeDetail, model.VendorIDMTWM, -9) + response = api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, msg.Cmd) } } return response diff --git a/business/partner/purchase/mtwm/callback.go b/business/partner/purchase/mtwm/callback.go index 52fc6af18..356c4e1c2 100644 --- a/business/partner/purchase/mtwm/callback.go +++ b/business/partner/purchase/mtwm/callback.go @@ -20,7 +20,8 @@ func OnCallbackMsg(msg *mtwmapi.CallbackMsg) (response *mtwmapi.CallbackResponse // 门店授权发生变化 17,失去授权 vendorStoreID := msg.FormData.Get("app_poi_code") storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreID, model.VendorIDMTWM, "") - netprinter.PrintStoreStatus(jxcontext.AdminCtx, storeDetail, model.VendorIDMTWM, -9) + _, err := netprinter.PrintStoreStatus(jxcontext.AdminCtx, storeDetail, model.VendorIDMTWM, -9) + response = mtwmapi.Err2CallbackResponse(err, "") } else { if orderID := GetOrderIDFromMsg(msg); orderID != "" { jxutils.CallMsgHandler(func() { From a477745f84bf7b8f64c5936012f1f2aa8fa60f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 23 Aug 2022 09:58:20 +0800 Subject: [PATCH 19/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxutils/netprinter/netprinter.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxutils/netprinter/netprinter.go b/business/jxutils/netprinter/netprinter.go index ff3cfff42..20764764f 100644 --- a/business/jxutils/netprinter/netprinter.go +++ b/business/jxutils/netprinter/netprinter.go @@ -40,7 +40,7 @@ func PrintOrder(ctx *jxcontext.Context, vendorOrderID string, vendorID int) (pri order.StoreID = storeID order.JxStoreID = storeID } - printResult, err = PrintOrderByOrder(ctx, order, "") + printResult, err = PrintOrderByOrder(ctx, order, "order") } return printResult, err } From f371a948af3f90d34651a7573307ecada9da29fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 23 Aug 2022 13:50:27 +0800 Subject: [PATCH 20/24] =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=9C=A8=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E6=89=93=E5=8D=B0=E6=9C=BA=E6=97=B6,=E5=B0=86?= =?UTF-8?q?=E7=94=B5=E8=AF=9D=E5=8F=B7=E7=A0=81=E4=BD=9C=E4=B8=BA=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=9C=BA=E7=9A=84printKey?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/printer/jxprint/jxprint.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index 2ff535df3..8701a2124 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -63,8 +63,9 @@ func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, id1, id2, print if globals.EnableStoreWrite { err = api.JxPrintAPI.AddPrinter([]*jxprintapi.AddPrinterParam{ &jxprintapi.AddPrinterParam{ - PrintNo: id1, + PrintNo: id1, // 打印机编号 Name: printerName, + SIM: id2, // printKey-指定验证用户号码 }, }) } From 5cc6d9e41df215e7a040068d73563b5d4cc77fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 24 Aug 2022 09:45:20 +0800 Subject: [PATCH 21/24] 1 --- business/model/const.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/model/const.go b/business/model/const.go index 908d3b555..3b2a77ea1 100644 --- a/business/model/const.go +++ b/business/model/const.go @@ -186,7 +186,7 @@ var ( VendorIDJxprint: []string{ VendorChineseNames[VendorIDJxprint], "打印机编号", - "不填", + "密钥", }, } AfsReasonTypeName = map[int]string{ From dde11091505c276eed221ec7951aed836403a4f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 24 Aug 2022 10:43:54 +0800 Subject: [PATCH 22/24] 1 --- business/partner/printer/jxprint/jxprint.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index 8701a2124..ff9e480f3 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -63,9 +63,11 @@ func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, id1, id2, print if globals.EnableStoreWrite { err = api.JxPrintAPI.AddPrinter([]*jxprintapi.AddPrinterParam{ &jxprintapi.AddPrinterParam{ - PrintNo: id1, // 打印机编号 - Name: printerName, - SIM: id2, // printKey-指定验证用户号码 + PrintNo: id1, // 打印机编号 + Name: printerName, + SIM: id2, // printKey-指定验证用户号码 + StoreId: 0, // 门店id + StoreName: printerName, // 门店名称 }, }) } From 2ce879a661db72add9f91d33b1d46b0088fffb96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 24 Aug 2022 11:03:22 +0800 Subject: [PATCH 23/24] 1 --- business/jxstore/cms/store.go | 6 +++--- business/partner/partner_printer.go | 2 +- business/partner/printer/feie/feie.go | 2 +- business/partner/printer/jxprint/jxprint.go | 11 +++++------ business/partner/printer/xiaowm/xiaowm.go | 2 +- business/partner/printer/yilianyun/yilianyun.go | 2 +- business/partner/printer/zhongwu/zhongwu.go | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index f280616d9..7d0d64200 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -895,7 +895,7 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa if valid["printerKey"] == nil { valid["printerKey"] = store.PrinterKey } - newID1, newID2, err2 := handler.RegisterPrinter(ctx, valid["printerSN"].(string), valid["printerKey"].(string), store.Name) + newID1, newID2, err2 := handler.RegisterPrinter(ctx, valid["printerSN"].(string), valid["printerKey"].(string), store.Name, int64(store.ID)) if err = err2; err != nil { return 0, err } @@ -1207,7 +1207,7 @@ func CreateStore(ctx *jxcontext.Context, storeExt *StoreExt, userName string) (i if handler == nil { return 0, fmt.Errorf("不支持的打印机厂商ID:%d", store.PrinterVendorID) } - newID1, newID2, err2 := handler.RegisterPrinter(ctx, store.PrinterSN, store.PrinterKey, store.Name) + newID1, newID2, err2 := handler.RegisterPrinter(ctx, store.PrinterSN, store.PrinterKey, store.Name, int64(store.ID)) if err = err2; err != nil { return 0, err } @@ -1315,7 +1315,7 @@ func CreateStore2JX(ctx *jxcontext.Context, storeExt *StoreExt, userName string) if handler == nil { return 0, fmt.Errorf("不支持的打印机厂商ID:%d", store.PrinterVendorID) } - newID1, newID2, err2 := handler.RegisterPrinter(ctx, store.PrinterSN, store.PrinterKey, store.Name) + newID1, newID2, err2 := handler.RegisterPrinter(ctx, store.PrinterSN, store.PrinterKey, store.Name, int64(store.ID)) if err = err2; err != nil { return 0, err } diff --git a/business/partner/partner_printer.go b/business/partner/partner_printer.go index a67a20cfa..f0b177393 100644 --- a/business/partner/partner_printer.go +++ b/business/partner/partner_printer.go @@ -56,7 +56,7 @@ type IPrinterHandler interface { PrintMsg(ctx *jxcontext.Context, id1, id2, msgTitle, msgContent string) (printerStatus *PrinterStatus, err error) GetPrinterStatus(ctx *jxcontext.Context, id1, id2 string) (printerStatus *PrinterStatus, err error) - RegisterPrinter(ctx *jxcontext.Context, id1, id2, printerName string) (newID1, newID2 string, err error) + RegisterPrinter(ctx *jxcontext.Context, id1, id2, printerName string, soreId int64) (newID1, newID2 string, err error) UnregisterPrinter(ctx *jxcontext.Context, id1, id2 string) (err error) BindPrinter(ctx *jxcontext.Context, mapData map[string]interface{}) (bindResult *BindPrinterResult, err error) diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go index 762f462cf..cceab9bda 100644 --- a/business/partner/printer/feie/feie.go +++ b/business/partner/printer/feie/feie.go @@ -273,7 +273,7 @@ func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printT return nil, err } -func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, printerSN, printerKey, printerName string) (notUsed1, notUsed2 string, err error) { +func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, printerSN, printerKey, printerName string, storeID int64) (notUsed1, notUsed2 string, err error) { var no map[string]string if globals.EnableStoreWrite { _, no, err = api.FeieAPI.PrinterAddList([]*feieapi.PrinterInfo{ diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index ff9e480f3..8c76e59db 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -59,15 +59,14 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, id1, id2 strin return nil, err } -func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, id1, id2, printerName string) (newID1, newID2 string, err error) { +func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, id1, id2, printerName string, storeID int64) (newID1, newID2 string, err error) { if globals.EnableStoreWrite { err = api.JxPrintAPI.AddPrinter([]*jxprintapi.AddPrinterParam{ &jxprintapi.AddPrinterParam{ - PrintNo: id1, // 打印机编号 - Name: printerName, - SIM: id2, // printKey-指定验证用户号码 - StoreId: 0, // 门店id - StoreName: printerName, // 门店名称 + PrintNo: id1, // 打印机编号 + Name: printerName, // 门店名称 + SIM: id2, // printKey-指定验证用户号码 + StoreId: storeID, // 门店id }, }) } diff --git a/business/partner/printer/xiaowm/xiaowm.go b/business/partner/printer/xiaowm/xiaowm.go index eb55a87aa..6ec3ec472 100644 --- a/business/partner/printer/xiaowm/xiaowm.go +++ b/business/partner/printer/xiaowm/xiaowm.go @@ -320,7 +320,7 @@ func isV500(printerNo string) bool { return printerNoNum > 1000000000 } -func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, printerNumber, notUsed, printerName string) (newID1, printerToken string, err error) { +func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, printerNumber, notUsed, printerName string, storeID int64) (newID1, printerToken string, err error) { globals.SugarLogger.Debugf("xiaowm RegisterPrinter printerNumber:%s", printerNumber) if printerNumber == "" { //len(printerNumber) != len("7JizmSyiXNzkggaqU") { err = fmt.Errorf("外卖管家打印机设备编号:%s长度不合法", printerNumber) diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go index 104f5a301..360dced3f 100644 --- a/business/partner/printer/yilianyun/yilianyun.go +++ b/business/partner/printer/yilianyun/yilianyun.go @@ -442,7 +442,7 @@ func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printT return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, order.VendorOrderID, content) } -func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, machineCode, secret, printerName string) (notUsed1, notUsed2 string, err error) { +func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, machineCode, secret, printerName string, storeID int64) (notUsed1, notUsed2 string, err error) { if globals.EnableStoreWrite { err = api.YilianyunAPI.AddPrinter(machineCode, secret, printerName) } diff --git a/business/partner/printer/zhongwu/zhongwu.go b/business/partner/printer/zhongwu/zhongwu.go index 80f582acc..78cf43e51 100644 --- a/business/partner/printer/zhongwu/zhongwu.go +++ b/business/partner/printer/zhongwu/zhongwu.go @@ -238,7 +238,7 @@ func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printT return nil, err } -func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, deviceID, deviceSecret, printerName string) (notUsed1, notUsed2 string, err error) { +func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, deviceID, deviceSecret, printerName string, storeID int64) (notUsed1, notUsed2 string, err error) { if deviceID == "" || deviceSecret == "" { err = fmt.Errorf("打印机ID与打印机密钥都不能为空") } From ca4ef5171d2d0c4073e1c3d3b53d9871f9358f92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 24 Aug 2022 14:58:12 +0800 Subject: [PATCH 24/24] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 4 ++-- business/jxcallback/scheduler/defsch/defsch_afs.go | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index a07288289..373c2d227 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -499,7 +499,7 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod } msghub.OnKeyOrderStatusChanged(savedOrderInfo.order) } - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder) + //netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder) } } return err @@ -513,7 +513,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo order := savedOrderInfo.order // 打印通知 - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeWayBill) + //netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeWayBill) // 获取订单配送平台，如果是美团则需要获取门店配置的配送方式 //isBlendWay := false diff --git a/business/jxcallback/scheduler/defsch/defsch_afs.go b/business/jxcallback/scheduler/defsch/defsch_afs.go index b3c24e506..6db0d3357 100644 --- a/business/jxcallback/scheduler/defsch/defsch_afs.go +++ b/business/jxcallback/scheduler/defsch/defsch_afs.go @@ -3,7 +3,6 @@ package defsch import ( "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" - "git.rosy.net.cn/jx-callback/business/jxutils/netprinter" push "git.rosy.net.cn/jx-callback/business/jxutils/unipush" "git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg" "git.rosy.net.cn/jx-callback/business/model" @@ -36,11 +35,11 @@ func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err push.NotifyAfsOrder(order) // 打印通知 - if handler := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID); handler != nil { - if orderObj, err2 := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, ""); err2 == nil && order != nil { - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintTypeOrder) - } - } + //if handler := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID); handler != nil { + // if orderObj, err2 := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, ""); err2 == nil && order != nil { + // netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintTypeOrder) + // } + //} } } return err