From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiKnowledgeAction.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiKnowledgeAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiKnowledgeAction.java
index 5089f28..5aaab06 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiKnowledgeAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiKnowledgeAction.java
@@ -4,8 +4,12 @@
import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.app.dto.ArticleListDto;
import com.matrix.system.hive.action.BaseController;
+import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.Article;
import com.matrix.system.hive.bean.ArticleType;
+import com.matrix.system.hive.bean.SysShopInfo;
+import com.matrix.system.hive.dao.ArticleDao;
+import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.service.ArticleService;
import com.matrix.system.hive.service.ArticleTypeService;
import io.swagger.annotations.Api;
@@ -25,6 +29,7 @@
@Autowired
private ArticleTypeService articleTypeService;
+
@Autowired
private ArticleService articleService;
@@ -32,8 +37,7 @@
@GetMapping(value = "/findKnowledgeType")
public AjaxResult findKnowledgeType() {
ArticleType type = new ArticleType();
- type.setShopId(getMe().getShopId());
- type.setParentId(0L);
+ type.setCompanyId(getMe().getCompanyId());
return AjaxResult.buildSuccessInstance(articleTypeService.findByModel(type));
}
@@ -45,6 +49,7 @@
pageVo.setLimit(articleListDto.getPageSize());
Article article = new Article();
+ QueryUtil.setQueryLimitCom(article);
article.setTypeId(articleListDto.getTypeId());
return AjaxResult.buildSuccessInstance(articleService.findApiArticleListInPage(article, pageVo));
}
--
Gitblit v1.9.1