From fd95223d9703b9c038ed3c782474c885052dda08 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 22 十二月 2023 17:05:25 +0800
Subject: [PATCH] 代码整理
---
consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 deletions(-)
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 d01ab23..b118221 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
@@ -1,5 +1,13 @@
package com.consum.base.service.impl;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
import com.consum.base.Constants;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapperUtil;
@@ -8,11 +16,6 @@
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
/**
* @Description 鐗╁搧妯℃澘
@@ -32,7 +35,7 @@
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_models WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
- //鐗╁搧妯℃澘id
+ // 鐗╁搧妯℃澘id
sql.append(" and goods_templates_id =:goods_templates_id ");
paramts.put("goods_templates_id", goodsTemplatesId);
@@ -50,10 +53,10 @@
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_models WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
- //瑙勬牸鍨嬪彿鍚嶇О
+ // 瑙勬牸鍨嬪彿鍚嶇О
sql.append(" and MODEL_NAME =:MODEL_NAME ");
paramts.put("MODEL_NAME", models.getModelName());
- //鐗╁搧妯℃澘id
+ // 鐗╁搧妯℃澘id
sql.append(" and GOODS_TEMPLATES_ID =:GOODS_TEMPLATES_ID ");
paramts.put("GOODS_TEMPLATES_ID", models.getGoodsTemplatesId());
if (models.getStates() != null) {
@@ -108,7 +111,7 @@
public List<BaseGoodsModels> selectByModelsIdList(List<Long> idList) {
if (CollectionUtils.isEmpty(idList)) {
log.error("鍙傛暟閿欒");
- return null;
+ return Collections.emptyList();
}
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_models WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -126,21 +129,6 @@
}
/**
- * @Description 鏍规嵁鐗╁搧id鏌ヨ瑙勬牸鍨嬪彿
- * @Author 鍗㈠簡闃�
- * @Date 2023/10/30
- */
- @Override
- public List<BaseGoodsModels> queryByGoodsTemplatesId(Long goodsTemplatesId) {
- BaseGoodsModels baseGoodsModels = new BaseGoodsModels();
- baseGoodsModels.setGoodsTemplatesId(goodsTemplatesId);
- return this.select(baseGoodsModels);
- }
-
-
- private String QUERY_GOODS_MODEL_INFO = "SELECT CLASSIFICATION type, goodsTemp.CATEGORY_ID,goodsTemp.CATEGORY_NAME,goodsTemp.id goods_Id,goodsTemp.GOODS_NAME,model.MODEL_NAME,model.id base_Goods_Models_Id,model.UNIT FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON model.GOODS_TEMPLATES_ID=goodsTemp.id";
-
- /**
* 鏍规嵁鐗╁搧鍨嬪彿id 鏌ヨ鐗╁搧淇℃伅
*
* @param baseGoodsModelsId
@@ -148,11 +136,25 @@
*/
@Override
public List<Map<String, Object>> queryGoodsModelInfo(Long baseGoodsModelsId) {
- StringBuilder sql = new StringBuilder(QUERY_GOODS_MODEL_INFO);
+ StringBuilder sql = new StringBuilder(
+ "SELECT CLASSIFICATION type, goodsTemp.CATEGORY_ID,goodsTemp.CATEGORY_NAME,goodsTemp.id goods_Id,"
+ + "goodsTemp.GOODS_NAME,model.MODEL_NAME,model.id base_Goods_Models_Id,model.UNIT "
+ + "FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON model.GOODS_TEMPLATES_ID=goodsTemp.id ");
HashMap<String, Object> paramts = new HashMap<>();
sql.append(" where model.id=:baseGoodsModelsId");
paramts.put("baseGoodsModelsId", baseGoodsModelsId);
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<>();
+ if (baseGoodsModelsId != null) {
+ sql.append("and goods_templates_id=:baseGoodsModelsId");
+ param.put("baseGoodsModelsId", baseGoodsModelsId);
+ }
+ return select(sql.toString(), param, new BaseGoodsModels());
+ }
+
}
--
Gitblit v1.9.1