From 5d91129464fd4e8a0bfb5c1c11a11710197e2e76 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 08 十月 2023 11:57:14 +0800
Subject: [PATCH] 去掉无用参数
---
api/v1/task.go | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 44aa2fb..ac472cb 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -284,11 +284,10 @@
}
err = model.WithTransaction(func(db *gorm.DB) error {
- err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, params.Channel)
+ err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel)
if err != nil {
return err
}
- procedure.Channel = params.Channel
err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing)
if err != nil {
return err
@@ -310,11 +309,10 @@
if err != nil {
logx.Errorf("SendProcessParams: %v", err.Error())
err = model.WithTransaction(func(db *gorm.DB) error {
- err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusWaitProcess, params.Channel)
+ err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusWaitProcess, procedure.Channel)
if err != nil {
return err
}
- procedure.Channel = params.Channel
err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusWaitProcess)
if err != nil {
return err
@@ -325,7 +323,7 @@
return
}
plcConfig.CurrentTryTimes = 0
- err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, params.Channel, order.Amount.IntPart())
+ err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, procedure.Channel, order.Amount.IntPart())
if err != nil {
ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆")
return
--
Gitblit v1.8.0