From 583fc7b7ed2ab5961c50e24e779262f168b9d55f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 06 May 2022 15:46:39 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java | 68 ++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 28 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 ce729a9..bd74596 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
@@ -1,6 +1,7 @@
package com.matrix.system.padApi.action;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import com.matrix.component.asyncmessage.AsyncMessageManager;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
@@ -29,6 +30,7 @@
import com.matrix.system.hive.service.SysOrderService;
import com.matrix.system.hive.service.SysShopInfoService;
import com.matrix.system.padApi.dto.PadOrderListDto;
+import com.matrix.system.padApi.dto.PadShowListDto;
import com.matrix.system.padApi.vo.PadOrderDetailVo;
import com.matrix.system.shopXcx.mqTask.AsyncMessageRouting;
import com.matrix.system.wechart.templateMsg.UniformMsgParam;
@@ -36,7 +38,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;
@@ -54,12 +55,26 @@
@Resource
private SysOrderService sysOrderService;
-
@Resource
private SysOrderService orderService;
-
@Autowired
private BusParameterSettingsDao busParameterSettingsDao;
+ @Autowired
+ private SysOrderItemDao orderItemDao;
+ @Autowired
+ private SysUsersService sysUsersService;
+ @Autowired
+ private CustomerDataDictionaryDao dataDictionaryDao;
+ @Resource
+ private SysShopInfoService currentService;
+ @Resource
+ private MoneyCardUseService cardUseService;
+ @Autowired
+ private AsyncMessageManager asyncMessageManager;
+ @Resource
+ private SysShopInfoDao shopInfoDao;
+ @Resource
+ private ShoppingGoodsService shoppingGoodsService;
@ApiOperation(value = "获取订单列表", notes = "获取订单列表")
@ApiResponses({
@@ -97,7 +112,7 @@
@ApiOperation(value = "取消订单", notes = "取消订单")
@GetMapping(value = "/cancelOrder/{id}")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult cancelOrder(Long id) {
+ public AjaxResult cancelOrder(@PathVariable Long id) {
SysOrder order = orderService.findById(id);
if (ObjectUtil.isEmpty(order)) {
@@ -129,23 +144,6 @@
orderService.updateAfterMoney(order);
return AjaxResult.buildSuccessInstance("补交成功");
}
-
- @Autowired
- private SysOrderItemDao orderItemDao;
- @Autowired
- private SysUsersService sysUsersService;
- @Autowired
- private CustomerDataDictionaryDao dataDictionaryDao;
- @Resource
- private SysShopInfoService currentService;
- @Resource
- private MoneyCardUseService cardUseService;
- @Autowired
- private AsyncMessageManager asyncMessageManager;
- @Resource
- private SysShopInfoDao shopInfoDao;
- @Resource
- private ShoppingGoodsService shoppingGoodsService;
@ApiOperation(value = "查询当前登录人", notes = "查询当前登录人")
@GetMapping(value = "/getLoginUser")
@@ -189,7 +187,7 @@
@ApiOperation(value = "获取用户的可用充值卡", notes = "获取用户的可用充值卡")
@GetMapping(value = "getUseMoneyCard/{vipId}")
- public AjaxResult getUseMoneyCard(Long vipId) {
+ public AjaxResult getUseMoneyCard(@PathVariable Long vipId) {
MoneyCardUse moneyCardUse = new MoneyCardUse();
moneyCardUse.setVipId(vipId);
moneyCardUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
@@ -203,13 +201,27 @@
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 = "列表显示搜索项目绑定的产品信息")
@PostMapping(value = "/showList")
- public AjaxResult showList(@RequestBody ShoppingGoods shoppingGoods, PaginationVO pageVo) {
- QueryUtil.setQueryLimit(shoppingGoods);
+ public AjaxResult showList(@RequestBody PadShowListDto padShowListDto) {
+
+ int offset = (padShowListDto.getPageNum() - 1) * padShowListDto.getPageSize();
+ int limit = padShowListDto.getPageSize();
+ PaginationVO pageVo = new PaginationVO();
+ pageVo.setOffset(offset);
+ pageVo.setLimit(limit);
+
+ ShoppingGoods shoppingGoods = new ShoppingGoods();
+ if(StrUtil.isNotEmpty(padShowListDto.getName())){
+ shoppingGoods.setName(padShowListDto.getName());
+ }
+ if(StrUtil.isNotEmpty(padShowListDto.getGoodType())){
+ shoppingGoods.setGoodType(padShowListDto.getGoodType());
+ }
+// QueryUtil.setQueryLimit(shoppingGoods);
if(StringUtils.isBlank(pageVo.getSort())){
pageVo.setOrder("desc");
pageVo.setSort("createTime");
@@ -246,7 +258,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 = "订单支付")
@@ -267,7 +279,7 @@
asyncMessageManager.sendMsg(AsyncMessageRouting.SEND_UNIFORM_TEMPLATE_MSG ,uniformMsgParam);
//处理用户购买的产品
- return AjaxResult.buildSuccessInstance(java.util.Arrays.asList(sysOrder), "订单结算成功");
+ return AjaxResult.buildSuccessInstance(sysOrder, "订单结算成功");
}
@ApiOperation(value = "订单保存接口-挂单", notes = "订单保存接口-挂单")
@@ -279,7 +291,7 @@
//校验保存订单
sysOrder = orderService.checkAndSaveOrder(sysOrder);
//处理用户购买的产品
- return AjaxResult.buildSuccessInstance(java.util.Arrays.asList(sysOrder), "订单保存成功");
+ return AjaxResult.buildSuccessInstance(sysOrder, "订单保存成功");
}
--
Gitblit v1.9.1