From 8ae34d73a8c0b7bd9373f0e2f65167c954007e2e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 07 May 2022 10:42:41 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java | 99 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 91 insertions(+), 8 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 7740ff6..2084daf 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
@@ -23,12 +23,10 @@
import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
+import com.matrix.system.hive.dao.ShoppingGoodsDao;
import com.matrix.system.hive.dao.SysOrderItemDao;
import com.matrix.system.hive.dao.SysShopInfoDao;
-import com.matrix.system.hive.service.MoneyCardUseService;
-import com.matrix.system.hive.service.ShoppingGoodsService;
-import com.matrix.system.hive.service.SysOrderService;
-import com.matrix.system.hive.service.SysShopInfoService;
+import com.matrix.system.hive.service.*;
import com.matrix.system.padApi.dto.PadOrderListDto;
import com.matrix.system.padApi.dto.PadShowListDto;
import com.matrix.system.padApi.vo.PadOrderDetailVo;
@@ -89,12 +87,39 @@
pageVo.setOffset(offset);
pageVo.setLimit(limit);
+ //默认排序
+ if (StringUtils.isBlank(pageVo.getSort())) {
+ pageVo.setSort("order_time");
+ }
+ if (StringUtils.isBlank(pageVo.getOrder())) {
+ pageVo.setOrder("desc");
+ }
if (!DataAuthUtil.hasAllShopAuth()) {
- orderListDto.setShopId(user.getShopId());
+ orderListDto.setShopId(getMe().getShopId());
}
QueryUtil.setQueryLimitCom(orderListDto);
- return AjaxResult.buildSuccessInstance(sysOrderService.findPadApiOrderListInPage(orderListDto, pageVo),
- sysOrderService.findPadApiOrderListTotal(orderListDto));
+
+ SysOrder sysOrder = new SysOrder();
+ sysOrder.setShopId(orderListDto.getShopId());
+ if(ObjectUtil.isNotEmpty(orderListDto.getOrderStatus())){
+ sysOrder.setStatu(orderListDto.getStatus());
+ }
+
+ if(ObjectUtil.isNotEmpty(orderListDto.getBeginTimeVo())){
+ sysOrder.setBeginTimeVo(orderListDto.getBeginTimeVo());
+ }
+ if(ObjectUtil.isNotEmpty(orderListDto.getEndTimeVo())){
+ sysOrder.setEndTimeVo(orderListDto.getEndTimeVo());
+ }
+
+ if(ObjectUtil.isNotEmpty(orderListDto.getVipId())){
+ sysOrder.setVipId(orderListDto.getVipId());
+ }
+ if(StrUtil.isNotEmpty(orderListDto.getQueryKey())){
+ sysOrder.setKeyWordVo(orderListDto.getQueryKey());
+ }
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, orderService.findInPage(sysOrder, pageVo),
+ orderService.findTotal(sysOrder));
}
@ApiOperation(value = "获取订单详情", notes = "获取订单详情")
@@ -112,7 +137,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)) {
@@ -295,4 +320,62 @@
}
+ @Autowired
+ ShoppingGoodsDao shoppingGoodsDao;
+
+ @Autowired
+ private SysOrderItemService orderItemService;
+
+ @Autowired
+ private AchieveNewService achieveNewService;
+
+ @Autowired
+ private SysVipInfoService sysVipInfoService;
+
+ @Autowired
+ private SysOrderFlowService sysOrderFlowService;
+
+ @ApiOperation(value = "列表进入详情", notes = "列表进入详情")
+ @PostMapping(value = "/findOrderDetailByIdOrNo")
+ public AjaxResult findOrderDetailByIdOrNo(@RequestBody SysOrder orderVo) {
+ // 根据id查到对应的订单信息
+ SysOrder order = null;
+ if (orderVo.getId() != null) {
+ order = orderService.findById(orderVo.getId());
+ } else if (StringUtils.isNotBlank(orderVo.getOrderNo())) {
+ List<SysOrder> byModel = orderService.findByModel(orderVo);
+ if (byModel.size() == 1) {
+ order = orderService.findById(byModel.get(0).getId());
+ }
+ }
+ List<SysOrderItem> sysOrderItems = orderItemDao.selectByOrderId(order.getId());
+ order.setItems(sysOrderItems);
+
+ SysVipInfo vipInfo = sysVipInfoService.findById(order.getVipId());
+ // 根据会员Id查到会员有效的会员卡
+ // 根据订单号查找订单条目
+ List<SysOrderItem> orderItems = orderItemService.findByOrderId(order.getId());
+
+ MoneyCardUse moneyCardUse = new MoneyCardUse();
+ moneyCardUse.setVipId(order.getVipId());
+ List<MoneyCardUse> cards = cardUseService.findByModel(moneyCardUse);
+
+ List<SysOrderFlow> flows = sysOrderFlowService.findByOrderId(order.getId());
+ order.setFlows(flows);
+
+ List<SysOrderFlow> payMethods = sysOrderFlowService.findPayMethodsAmount(order.getId());
+
+ List<AchieveNew> achieveList = achieveNewService.findOrderItemAchieve(order.getId());
+
+ AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("获取成功");
+ ajaxResult.putInMap("orderItems", orderItems);
+ ajaxResult.putInMap("order", order);
+ ajaxResult.putInMap("cards", cards);
+ ajaxResult.putInMap("vipInfo", vipInfo);
+ ajaxResult.putInMap("payMethods", payMethods);
+ ajaxResult.putInMap("achieveList", achieveList);
+ return ajaxResult;
+ }
+
+
}
--
Gitblit v1.9.1