From 955b271eb3fefd41986d8a7f4344309a13728874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 27 Jul 2022 14:07:27 +0800 Subject: [PATCH] 1 --- business/jxstore/event/event_tcp_utils.go | 2 +- business/jxstore/event/print_test.go | 2 +- business/q_bida/q_bida_server.go | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/business/jxstore/event/event_tcp_utils.go b/business/jxstore/event/event_tcp_utils.go index 9326591a9..0c8659b38 100644 --- a/business/jxstore/event/event_tcp_utils.go +++ b/business/jxstore/event/event_tcp_utils.go @@ -491,7 +491,7 @@ func replaceContent(content string, printMsg *model.PrintMsg) (result string) { } globals.SugarLogger.Debug("voice==================", voice) result = strings.ReplaceAll(result, sound, "") - result = strings.ReplaceAll(result, byteSignSound, "1B59415502") + result = strings.ReplaceAll(result, byteSignSound, "1B594155021B594155031B594155041B594155051B594155061B594155071B59415508") } } // 自动合成语音功能 diff --git a/business/jxstore/event/print_test.go b/business/jxstore/event/print_test.go index d7ee0ad18..d6bc30e59 100644 --- a/business/jxstore/event/print_test.go +++ b/business/jxstore/event/print_test.go @@ -13,7 +13,7 @@ func TestPrintMsg(t *testing.T) { msg := &model.PrintMsg{ ModelIDCULD: model.ModelIDCULD{}, PrintNo: "20220707000002", - Content: "20", + Content: "21", OrderNo: 202207261655, Status: 0, Comment: "", diff --git a/business/q_bida/q_bida_server.go b/business/q_bida/q_bida_server.go index 1d7586c3e..26e198a45 100644 --- a/business/q_bida/q_bida_server.go +++ b/business/q_bida/q_bida_server.go @@ -243,7 +243,6 @@ func CancelWayOrder(ctx *jxcontext.Context, userId string, param *bida.CancelOrd // 暂时考虑余额支付渠道,加载order表判断支付渠道方式 orderWay := &model.Order{OrderID: param.OrderNo, UserID: userId} if err := dao.GetEntity(dao.GetDB(), orderWay, "OrderID", "UserID"); err != nil { - return err } @@ -351,8 +350,6 @@ func CreateOrder2QBiDa(order *model.UserVendorOrder, orderId string) error { // globals.SugarLogger.Debug("Callback Success But Order Status Update Fail ....") // return errors.New("Callback Success But Order Status Update Fail ") //} - globals.SugarLogger.Debug("order==================", order) - globals.SugarLogger.Debug("order==================", order.LocalWayBill) // 创建QBIDA订单 makeOrder := &bida.MakeOrderReq{