From 05a82deffa89a22fa35abaa9196053f43cbc1103 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:51:07 +0800
Subject: [PATCH] fix

---
 zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java |   80 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 70 insertions(+), 10 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 b8e3727..75669ba 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;
@@ -254,13 +252,17 @@
             pageVo.setSort("createTime");
         }
         //2表示查询总部产品
-        if (shoppingGoods.getHeadquarters()!=null && 2==shoppingGoods.getHeadquarters()) {
-            //仅查询本店产品
-            SysShopInfo zbShop = shopInfoDao.selectZbShop(getMe().getCompanyId());
-            //如果是总部自己查询自己的库存则不需加入这个调价
-            if (getMe().getShopId().equals(zbShop.getId())){
+//        if (shoppingGoods.getHeadquarters()!=null && 2==shoppingGoods.getHeadquarters()) {
+//            //仅查询本店产品
+//            SysShopInfo zbShop = shopInfoDao.selectZbShop(getMe().getCompanyId());
+//            //如果是总部自己查询自己的库存则不需加入这个调价
+//            if (getMe().getShopId().equals(zbShop.getId())){
+//                shoppingGoods.setHeadquarters(1);
+//            }
+//        }
+        SysShopInfo zbShop = shopInfoDao.selectZbShop(getMe().getCompanyId());
+        if (getMe().getShopId().equals(zbShop.getId())){
                 shoppingGoods.setHeadquarters(1);
-            }
         }
         shoppingGoods.setIsDel(ShoppingGoods.NORMAL);
         List<ShoppingGoods> dataList = shoppingGoodsService.findInPage(shoppingGoods, pageVo);
@@ -322,4 +324,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