From 11f925fdce0f58d1f321f3a13a3f3e84221c6912 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 13 十一月 2023 09:27:14 +0800
Subject: [PATCH] 整理代码

---
 consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
index 4db2cf8..24fa924 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
@@ -3,7 +3,7 @@
 import com.consum.base.Constants;
 import com.consum.base.core.CodeGeneratorService;
 import com.consum.base.pojo.BaseGoodsTemplateParam;
-import com.consum.base.util.IdUtil;
+import com.consum.base.core.utils.IdUtil;
 import com.consum.model.po.BaseCategory;
 import com.consum.model.po.BaseGoodsModels;
 import com.consum.model.po.BaseGoodsTemplate;
@@ -197,7 +197,12 @@
         }
         int flag1 = this.update(baseGoodsTemplate);
         //2.淇敼瑙勬牸鍨嬪彿鐨勫崟浣�
+        // TODO id 鐗╁搧鍨嬪彿淇敼寰呮暣鐞�
         List<BaseGoodsModels> modelsList = param.getModels();
+        for (BaseGoodsModels baseGoodsModel : modelsList) {
+            BaseGoodsModels baseGoodsModels = new BaseGoodsModels();
+            BeanUtils.copyProperties(baseGoodsModel, baseGoodsModels);
+        }
         int flag2 = this.update(modelsList);
 
         if (flag1 > 0 && flag2 > 0) {
@@ -295,13 +300,17 @@
         return this.select(goodsTemplate);
     }
 
-    public List<BaseGoodsTemplate> queryByAgencyId(Long agencyId) {
+    public List<BaseGoodsTemplate> queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId) {
         StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1=1 ");
         Map<String, Object> params = new HashMap<>();
         if (agencyId != null) {
-            sql.append(" AND model.id=:modelId");
+            sql.append("AND AGENCY_ID=:agencyId");
             params.put("agencyId", agencyId);
         }
+        if (categoryId != null) {
+            sql.append("AND CATEGORY_ID=:categoryId");
+            params.put("categoryId", categoryId);
+        }
         return this.select(sql.toString(), params, new BaseGoodsTemplate());
     }
 }

--
Gitblit v1.9.1