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 | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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 f5b82da..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
@@ -16,7 +16,6 @@
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.CustomerDataDictionaryDao;
-import com.matrix.system.common.service.OperationLogService;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.constance.Dictionary;
@@ -24,7 +23,9 @@
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.*;
+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.*;
import com.matrix.system.padApi.dto.PadOrderListDto;
import com.matrix.system.padApi.dto.PadShowListDto;
@@ -251,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);
@@ -329,9 +334,6 @@
private AchieveNewService achieveNewService;
@Autowired
- SysShopInfoDao shopInfoDao;
-
- @Autowired
private SysVipInfoService sysVipInfoService;
@Autowired
@@ -339,7 +341,7 @@
@ApiOperation(value = "列表进入详情", notes = "列表进入详情")
@PostMapping(value = "/findOrderDetailByIdOrNo")
- public AjaxResult findOrderDetailByIdOrNo(SysOrder orderVo) {
+ public AjaxResult findOrderDetailByIdOrNo(@RequestBody SysOrder orderVo) {
// 根据id查到对应的订单信息
SysOrder order = null;
if (orderVo.getId() != null) {
--
Gitblit v1.9.1