From 6b36599c6bd372a5cce5e078c2f4e4cb9e2ee36a Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 13 十二月 2023 19:07:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java | 9 +++++++++
consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsService.java | 2 ++
consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java | 4 +---
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
index 3108327..69659d2 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
@@ -122,9 +122,7 @@
@GetMapping("query/goodsModel")
public ResponseValue queryGoodsModelByGoodsTemplatesId(Long goodsTemplatesId) {
- BaseGoodsModels baseGoodsModels = new BaseGoodsModels();
- baseGoodsModels.setGoodsTemplatesId(goodsTemplatesId);
- List<BaseGoodsModels> result = baseGoodsModelsService.select(baseGoodsModels);
+ List<BaseGoodsModels> result = baseGoodsModelsService.queryGoodsModelByGoodsTemplatesId(goodsTemplatesId);
return ResponseValue.success(result);
}
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsService.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsService.java
index 2be3528..13f59d8 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsService.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsService.java
@@ -55,4 +55,6 @@
* @return
*/
List<Map<String, Object>> queryGoodsModelInfo(Long baseGoodsModelsId);
+
+ List<BaseGoodsModels> queryGoodsModelByGoodsTemplatesId(Long baseGoodsModelsId);
}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java
index 8b34c8a..9266ab3 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java
@@ -145,4 +145,13 @@
return select(sql.toString(), paramts, new MapperUtil());
}
+ @Override
+ public List<BaseGoodsModels> queryGoodsModelByGoodsTemplatesId(Long baseGoodsModelsId) {
+ StringBuilder sql = new StringBuilder("select * from base_goods_models where states != 3 ");
+ HashMap<String, Object> param = new HashMap<>();
+ sql.append("and goods_templates_id=:baseGoodsModelsId");
+ param.put("baseGoodsModelsId", baseGoodsModelsId);
+ return select(sql.toString(), param, new BaseGoodsModels());
+ }
+
}
--
Gitblit v1.9.1