liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2024-10-21 14:11:58 +08:00
parent 51f49d5ee0
commit 7b7341319e
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -346,6 +346,10 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, printerSN, pri
} }
func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string, asfOrder *model.AfsOrder) (printerStatus *partner.PrinterStatus, err error) { func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string, asfOrder *model.AfsOrder) (printerStatus *partner.PrinterStatus, err error) {
// 这个门店只打饿了么
if store.ID == 669264 && order.VendorID == model.VendorIDMTWM {
return nil, nil
}
if len(order.Skus) == 0 { if len(order.Skus) == 0 {
return return
} }
@@ -363,6 +367,10 @@ func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store,
} }
func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) {
// 这个门店只打饿了么
if store.ID == 669264 && order.VendorID == model.VendorIDMTWM {
return nil, nil
}
if len(order.Skus) == 0 { if len(order.Skus) == 0 {
return return
} }

3
controllers/im.go
View File

@@ -3,8 +3,6 @@ package controllers
import ( import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"fmt"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/jx-callback/business/partner/im" "git.rosy.net.cn/jx-callback/business/partner/im"
@@ -80,7 +78,6 @@ func (c *IMController) SendToVendorV2() {
b := bytes.NewBufferString(params.SendData) b := bytes.NewBufferString(params.SendData)
decoder := json.NewDecoder(b) decoder := json.NewDecoder(b)
if err = decoder.Decode(&sendData); err == nil { if err = decoder.Decode(&sendData); err == nil {
fmt.Println(sendData)
if err = im.SendVendorV2(sendData, params.VendorOrgCode); err != nil { if err = im.SendVendorV2(sendData, params.VendorOrgCode); err != nil {
return nil, "", err return nil, "", err
} }