From 68defbe491894e01c4402922de33c39633fca091 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Mar 2022 14:25:54 +0800
Subject: [PATCH] 系统名称
---
zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java
index 9fa37e7..b8a33b6 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java
@@ -98,7 +98,7 @@
ShoppingGoods shoppingGoods = new ShoppingGoods();
QueryUtil.setQueryLimit(shoppingGoods);
shoppingGoods.setName(keyword);
-// shoppingGoods.setStaus(Dictionary.BUSINESS_STATE_UP);// 只查询上架的商品
+ shoppingGoods.setStaus(Dictionary.BUSINESS_STATE_UP);// 只查询上架的商品
shoppingGoods.setSalePlatform(Dictionary.SHOPPING_GOODS_SALE_PLATFORM_XX);//只查询线下的商品
shoppingGoods.setGoodType(type);
shoppingGoods.setIsDel(ShoppingGoods.NORMAL);
@@ -129,7 +129,6 @@
shoppingGoods.setAssembleProj(shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(shoppingGoods.getId(), ShoppingGoods.SHOPPING_GOODS_TYPE_XM));
} else if (
Dictionary.SHOPPING_GOODS_TYPE_XM.equals(shoppingGoods.getGoodType())
- || Dictionary.SHOPPING_GOODS_TYPE_ZHK.equals(shoppingGoods.getGoodType())
) {
shoppingGoods.setAssembleGoods(shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(shoppingGoods.getId(), null));
} else if (Dictionary.SHOPPING_GOODS_TYPE_CZK.equals(shoppingGoods.getGoodType())) {
@@ -190,11 +189,34 @@
}
}
shoppingGoods.setIsDel(ShoppingGoods.NORMAL);
-// shoppingGoods.setStaus(Dictionary.BUSINESS_STATE_UP);
List<ShoppingGoods> dataList = shoppingGoodsService.findInPage(shoppingGoods, pageVo);
AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList, shoppingGoodsService.findTotal(shoppingGoods));
return result;
+ }
+
+ @RequestMapping(value = "/showAllList")
+ @ResponseBody
+ public AjaxResult showAllList(ShoppingGoods shoppingGoods, PaginationVO pageVo) {
+ QueryUtil.setQueryLimit(shoppingGoods);
+ if(StringUtils.isBlank(pageVo.getSort())){
+ pageVo.setOrder("desc");
+ pageVo.setSort("createTime");
+ }
+
+ //2表示查询总部产品
+ if (shoppingGoods.getHeadquarters()!=null && 2==shoppingGoods.getHeadquarters()) {
+ //仅查询本店产品
+ 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);
+ AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList, shoppingGoodsService.findTotal(shoppingGoods));
+ return result;
}
@RequestMapping(value = "/showListShopId")
@@ -292,9 +314,6 @@
shoppingGoods.setAssembleGoods(assembleListGoods);
List<ShoppingGoodsAssemble> assembleListProj = shoppingGoodsAssembleDao.selectProjByShoppingGoodsId(shoppingGoods.getId());
shoppingGoods.setAssembleProj(assembleListProj);
- } else if (Dictionary.SHOPPING_GOODS_TYPE_ZHK.equals(shoppingGoods.getGoodType())) {
- List<ShoppingGoodsAssemble> assembleList = shoppingGoodsAssembleDao.selectAssembleShoppingGoodsByShoppingGoodsId(shoppingGoods.getId());
- shoppingGoods.setZongheCarGoods(assembleList);
}
@@ -323,9 +342,6 @@
// 返回充值卡编辑界面
WebUtil.getRequest().setAttribute("obj", shoppingGoods);
return "admin/hive/products/money-card-form";
- } else if (shoppingGoods.getGoodType().equals(Dictionary.SHOPPING_GOODS_TYPE_ZHK)) {
- WebUtil.getRequest().setAttribute("obj", shoppingGoods);
- return "admin/hive/products/zonghe-card-form";
}
@@ -411,7 +427,7 @@
String title = "商品资料";
orderSheet.setSheetName(title);
orderSheet.setTitle(title);
- String[] header = {"商品名称", "商品编号", "售价/(本金)", "参考价/(赠送金额)", "真实销量", "状态", "是否赠送", "类型", "分类", "是否固定套餐", "产品归属"};
+ String[] header = {"商品名称", "商品编号", "售价/(本金)", "参考价/(赠送金额)", "真实销量", "状态", "是否赠送", "类型", "分类", "是否固定套餐", "产品归属","时长"};
orderSheet.setHeaders(header);
List<ShoppingGoods> dataList = shoppingGoodsService.findAll(shoppingGoods);
List<List<Object>> list = new ArrayList<>();
@@ -429,6 +445,7 @@
temp.add(item.getCateName());
temp.add(item.getIsCourse());
temp.add(item.getHeadquarters() == 1 ? "总部产品" : "本店产品");
+ temp.add(item.getTimeLength());
list.add(temp);
}
}
--
Gitblit v1.9.1