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

1

Browse Source
This commit is contained in:
邹宗楠
2022-07-27 14:07:27 +08:00
parent 46905fa513
commit 955b271eb3
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/event/event_tcp_utils.go
View File

@@ -491,7 +491,7 @@ func replaceContent(content string, printMsg *model.PrintMsg) (result string) {
} }
globals.SugarLogger.Debug("voice==================", voice) globals.SugarLogger.Debug("voice==================", voice)
result = strings.ReplaceAll(result, sound, "") result = strings.ReplaceAll(result, sound, "")
result = strings.ReplaceAll(result, byteSignSound, "1B59415502") result = strings.ReplaceAll(result, byteSignSound, "1B594155021B594155031B594155041B594155051B594155061B594155071B59415508")
} }
} }
// 自动合成语音功能 // 自动合成语音功能

2
business/jxstore/event/print_test.go
View File

@@ -13,7 +13,7 @@ func TestPrintMsg(t *testing.T) {
msg := &model.PrintMsg{ msg := &model.PrintMsg{
ModelIDCULD: model.ModelIDCULD{}, ModelIDCULD: model.ModelIDCULD{},
PrintNo: "20220707000002", PrintNo: "20220707000002",
Content: "<sound>20</sound>", Content: "<sound>21</sound>",
OrderNo: 202207261655, OrderNo: 202207261655,
Status: 0, Status: 0,
Comment: "", Comment: "",

3
business/q_bida/q_bida_server.go
View File

@@ -243,7 +243,6 @@ func CancelWayOrder(ctx *jxcontext.Context, userId string, param *bida.CancelOrd
// 暂时考虑余额支付渠道，加载order表判断支付渠道方式 // 暂时考虑余额支付渠道，加载order表判断支付渠道方式
orderWay := &model.Order{OrderID: param.OrderNo, UserID: userId} orderWay := &model.Order{OrderID: param.OrderNo, UserID: userId}
if err := dao.GetEntity(dao.GetDB(), orderWay, "OrderID", "UserID"); err != nil { if err := dao.GetEntity(dao.GetDB(), orderWay, "OrderID", "UserID"); err != nil {
return err return err
} }
@@ -351,8 +350,6 @@ func CreateOrder2QBiDa(order *model.UserVendorOrder, orderId string) error {
// globals.SugarLogger.Debug("Callback Success But Order Status Update Fail ....") // globals.SugarLogger.Debug("Callback Success But Order Status Update Fail ....")
// return errors.New("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订单 // 创建QBIDA订单
makeOrder := &bida.MakeOrderReq{ makeOrder := &bida.MakeOrderReq{