From 1ab8dbb7e0912bdc0f89617ac8105ae974889d42 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 05 May 2022 10:42:55 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java
index c453630..39faf6c 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java
@@ -36,7 +36,6 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
-import org.assertj.core.util.Arrays;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -200,7 +199,7 @@
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
SysOrder order = orderService.findById(id);
order.setItems(orderItemDao.selectByOrderId(id));
- return AjaxResult.buildSuccessInstance(Arrays.asList(order));
+ return AjaxResult.buildSuccessInstance(order);
}
@ApiOperation(value = "列表显示搜索项目绑定的产品信息", notes = "列表显示搜索项目绑定的产品信息")
@@ -243,7 +242,7 @@
sysOrderResult.setZkTotal(zkTotal.setScale(2, BigDecimal.ROUND_DOWN).doubleValue());
sysOrderResult.setTotal(total.doubleValue());
- return AjaxResult.buildSuccessInstance(java.util.Arrays.asList(sysOrderResult));
+ return AjaxResult.buildSuccessInstance(sysOrderResult);
}
@ApiOperation(value = "订单支付", notes = "订单支付")
@@ -264,7 +263,7 @@
asyncMessageManager.sendMsg(AsyncMessageRouting.SEND_UNIFORM_TEMPLATE_MSG ,uniformMsgParam);
//处理用户购买的产品
- return AjaxResult.buildSuccessInstance(java.util.Arrays.asList(sysOrder), "订单结算成功");
+ return AjaxResult.buildSuccessInstance(sysOrder, "订单结算成功");
}
@ApiOperation(value = "订单保存接口-挂单", notes = "订单保存接口-挂单")
@@ -276,7 +275,7 @@
//校验保存订单
sysOrder = orderService.checkAndSaveOrder(sysOrder);
//处理用户购买的产品
- return AjaxResult.buildSuccessInstance(java.util.Arrays.asList(sysOrder), "订单保存成功");
+ return AjaxResult.buildSuccessInstance(sysOrder, "订单保存成功");
}
--
Gitblit v1.9.1