From de4399c873593bb60cf75e1448129471ba4f7a21 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 17 Mar 2021 09:43:59 +0800
Subject: [PATCH] 分销订单0317
---
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java
index 98e2f77..ac4ce8b 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java
@@ -5,15 +5,21 @@
import com.matrix.biz.dao.BizUserDao;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
+import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.fenxiao.constant.FenxiaoSettingConstant;
import com.matrix.system.fenxiao.service.FenXiaoSettingService;
import com.matrix.system.fenxiao.vo.FenXiaoSettingVo;
+import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.ShoppingGoods;
import com.matrix.system.hive.dao.ShoppingGoodsDao;
+import com.matrix.system.shopXcx.bean.ShopProduct;
+import com.matrix.system.shopXcx.dao.ShopProductDao;
+
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,6 +43,9 @@
@Autowired
private BizUserDao bizUserDao;
+
+ @Autowired
+ private ShopProductDao shopProductDao;
/**
*查询分销配置
@@ -97,6 +106,24 @@
}
/**
+ * 列表显示
+ */
+ @RequestMapping(value = "/selectProduct")
+ public @ResponseBody
+ AjaxResult selectProduct(ShopProduct shopProduct, PaginationVO pageVo) {
+ QueryUtil.setQueryLimitCom(shopProduct);
+ pageVo.setSort("createTime");
+ pageVo.setOrder("desc");
+ shopProduct.setDelFlag(AppConstance.DATA_USEABLE);
+ shopProduct.setCompanyId(shopProduct.getCompanyId());
+ List<ShopProduct> dataList = shopProductDao.selectInPage(shopProduct, pageVo);
+ AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList,
+ shopProductDao.selectTotalRecord(shopProduct));
+ return result;
+
+ }
+
+ /**
*获取对应的规则设置数据
* @param ArrayCode
* @param ArrayName
--
Gitblit v1.9.1