From 3cd342a343fd67a32415b832abe1a39bab9e627d Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 09 Jul 2021 22:41:39 +0800
Subject: [PATCH] bug修复

---
 zq-erp/src/test/java/com/matrix/TcProjTest.java                                  |   16 ++++++++--------
 zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java           |    2 ++
 zq-erp/pom.xml                                                                   |    4 ++--
 zq-erp/src/main/java/com/matrix/system/hive/action/CardLevelController.java      |    2 +-
 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html |    2 +-
 zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java    |   31 ++++++++++---------------------
 6 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index ed1dc1f..8f383be 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -401,11 +401,11 @@
                     <exclude>config/xcx/*</exclude>
                     <exclude>config/xcshop/*</exclude>
 
-                    <!---->
+                    <!--
                     <exclude>config/config.json</exclude>
                     <exclude>config/application.properties</exclude>
                     <exclude>config/system.properties</exclude>
-
+-->
 
 
                     <exclude>**/*.woff</exclude>
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
index 70b7250..4cdafd3 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
@@ -450,6 +450,7 @@
     AjaxResult all() {
         SysUsers sysUsers = new SysUsers();
         QueryUtil.setQueryLimit(sysUsers);
+        sysUsers.setSuValid(AppConstance.RECORD_VALID);
         return new AjaxResult(AjaxResult.STATUS_SUCCESS, sysUsersService.findInPage(sysUsers, null));
     }
 
@@ -499,6 +500,7 @@
         orderSheet.setHeaders(header);
         SysUsers loginUser = getSessionUser();
         shopStaffInfo.setShopId(loginUser.getShopId());
+        shopStaffInfo.setSuValid(AppConstance.RECORD_VALID);
         List<SysUsers> dataList = sysUsersService.findInPage(shopStaffInfo, null);
         List<List<Object>> list = new ArrayList<>();
         if (dataList.size() > 0) {
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/CardLevelController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/CardLevelController.java
index b92149f..54729d2 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/CardLevelController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/CardLevelController.java
@@ -33,7 +33,7 @@
 	@RequestMapping(value = "/showList")
 	public @ResponseBody AjaxResult showList(SysVipLevel vipLevel,PaginationVO pageVo) {
 		SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
-		vipLevel.setShopId(users.getShopId());
+		vipLevel.setCompanyId(users.getCompanyId());
 		return showList(cardLevelService,vipLevel,pageVo);
 	}
 	/**
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java
index ed53c67..49064d1 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java
@@ -18,7 +18,6 @@
 import com.matrix.system.hive.bean.SysOrderItem;
 import com.matrix.system.hive.dao.SysOrderDao;
 import com.matrix.system.hive.dao.SysOrderItemDao;
-import com.matrix.core.tools.DateUtil;
 import com.matrix.system.hive.service.AchieveNewService;
 import com.matrix.system.hive.service.MoneyCardUseService;
 import com.matrix.system.hive.service.SysOrderItemService;
@@ -85,37 +84,27 @@
 //=======================================页面转发==================================
 
 
+
     /**
      * 跳转 消费流水详情页面
      *
      * @author jyy
      */
     @RequestMapping(value = "/orderItem")
-    public String orderItem(Long id, HttpServletRequest request) {
-        // 根据id查到对应的订单信息
-        SysOrder order = orderService.findById(id);
-        List<SysOrderItem> sysOrderItems = orderItemDao.selectByOrderId(id);
-        order.setItems(sysOrderItems);
+    public String orderItem(SysOrder orderVo) {
 
-        WebUtil.getRequest().setAttribute("order", order);
-        // 根据会员Id查到会员有效的会员卡
-        // 根据订单号查找订单条目
-        SysOrderItem orderItem = new SysOrderItem();
-        orderItem.setOrderId(id);
-        List<SysOrderItem> orderItems = orderItemService.findByModel(orderItem);
-        WebUtil.getRequest().setAttribute("orderItems", orderItems);
-
-        MoneyCardUse moneyCardUse = new MoneyCardUse();
-        moneyCardUse.setVipId(order.getVipId());
-        List<MoneyCardUse> cards = cardUseService.findByModel(moneyCardUse);
-
-        WebUtil.getRequest().setAttribute("orderParam", id);
-
-        WebUtil.getRequest().setAttribute("cards", cards);
+        if(orderVo.getId()!=null){
+            WebUtil.getRequest().setAttribute("orderParam", orderVo.getId());
+            WebUtil.getRequest().setAttribute("orderId", orderVo.getId());
+        }else if(StringUtils.isNotBlank(orderVo.getOrderNo())){
+            WebUtil.getRequest().setAttribute("orderParam", orderVo.getOrderNo());
+            WebUtil.getRequest().setAttribute("orderNo", orderVo.getOrderNo());
+        }
         return "admin/hive-erp/order/orderXq-form";
     }
 
 
+
     /**
      * 取消订单
      */
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html
index f066a6d..185869e 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html
@@ -625,7 +625,7 @@
                         //获取用户列表
                         AjaxProxy.requst({
                             app: _this,
-                            url: basePath + '/admin/shopAll',
+                            url: basePath + '/admin/all',
                             callback: function (data) {
                                 _this.userList = data.rows;
                             }
diff --git a/zq-erp/src/test/java/com/matrix/TcProjTest.java b/zq-erp/src/test/java/com/matrix/TcProjTest.java
index a6c485c..4b5e0ba 100644
--- a/zq-erp/src/test/java/com/matrix/TcProjTest.java
+++ b/zq-erp/src/test/java/com/matrix/TcProjTest.java
@@ -1,15 +1,12 @@
 package com.matrix;
 
-import cn.hutool.core.collection.CollUtil;
-import com.matrix.system.hive.bean.SysProjUse;
+import com.matrix.system.hive.dao.AchieveNewDao;
 import com.matrix.system.hive.dao.SysProjUseDao;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.List;
 
 /**
  * @author wzy
@@ -23,11 +20,14 @@
     @Autowired
     private SysProjUseDao sysProjUseDao;
 
+    @Autowired
+    AchieveNewDao achieveNewDao;
+
     @Test
     public void tcProjTest() {
-//        List<SysProjUse> projUses = sysProjUseDao.selectTaoCanListWithProj();
-//        if (CollUtil.isNotEmpty(projUses)) {
-//
-//        }
+        //achieveNewDao
+
+
+
     }
 }

--
Gitblit v1.9.1