From 8e41786892a4bd7cff2d63bde8cb0636cdb0650c Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 02 十二月 2023 20:54:51 +0800
Subject: [PATCH] 分转元

---
 consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java |   37 +++++++++++++++++++++++++++----------
 1 files changed, 27 insertions(+), 10 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/impl/BaseGoodsTemplateServiceImpl.java
similarity index 94%
rename from consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
index 5e6fc4a..31f86de 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
@@ -1,24 +1,30 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
 
 import com.consum.base.Constants;
 import com.consum.base.core.CodeGeneratorService;
 import com.consum.base.core.utils.IdUtil;
 import com.consum.base.pojo.BaseGoodsTemplateParam;
-import com.consum.model.po.*;
+import com.consum.base.service.BaseCategoryService;
+import com.consum.base.service.BaseGoodsModelsService;
+import com.consum.base.service.BaseGoodsTemplateService;
+import com.consum.model.po.BaseCategory;
+import com.consum.model.po.BaseGoodsModels;
+import com.consum.model.po.BaseGoodsTemplate;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.SDictData;
 import com.consum.model.vo.BaseGoodsTemplateVo;
 import com.iplatform.model.po.S_user_core;
 import com.walker.db.page.GenericPager;
 import com.walker.infrastructure.utils.DateUtils;
 import com.walker.infrastructure.utils.StringUtils;
 import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description 鐗╁搧妯℃澘
@@ -26,14 +32,14 @@
  * @Date 2023/10/23
  */
 @Service
-public class BaseGoodsTemplateServiceImpl extends BaseServiceImpl {
+public class BaseGoodsTemplateServiceImpl extends BaseServiceImpl implements BaseGoodsTemplateService {
 
     @Autowired
     private CodeGeneratorService codeGeneratorService;
     @Autowired
     private BaseCategoryService baseCategoryService;
     @Autowired
-    private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+    private BaseGoodsModelsService baseGoodsModelsService;
 
     /**
      * @return
@@ -41,6 +47,7 @@
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/23
      */
+    @Override
     public List<BaseCategory> getByCategoryId(Long categoryId) {
         StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1 = 1 ");
         HashMap<String, Object> paramts = new HashMap<>();
@@ -60,6 +67,7 @@
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/24
      */
+    @Override
     public int add(BaseGoodsTemplateParam param, FinSysTenantUser currentUser) {
         //1.鏂板鐗╁搧妯℃澘
         BaseGoodsTemplate baseGoodsTemplate = new BaseGoodsTemplate();
@@ -115,6 +123,7 @@
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/24
      */
+    @Override
     public GenericPager<BaseGoodsTemplate> queryList(BaseGoodsTemplateParam param) {
         StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1 = 1 ");
         HashMap<String, Object> paramts = new HashMap<>();
@@ -160,6 +169,7 @@
      * @author 鍗㈠簡闃�
      * @date 2023/9/26
      */
+    @Override
     public BaseGoodsTemplateVo getById(Long id) {
         //1.鏍规嵁鐗╁搧id鏌ヨ鐗╁搧妯℃澘
         BaseGoodsTemplate goodsTemplate = this.get(new BaseGoodsTemplate(id));
@@ -187,6 +197,7 @@
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/24
      */
+    @Override
     public int updateBaseGoodsTemplate(BaseGoodsTemplateParam param) {
         //1.淇敼鐗╁搧妯℃澘
         BaseGoodsTemplate baseGoodsTemplate = new BaseGoodsTemplate();
@@ -217,6 +228,7 @@
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/24
      */
+    @Override
     public BaseGoodsTemplate getByGoodsNameAndCategoryId(String goodsName, Long categoryId) {
         StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1 = 1 ");
         HashMap<String, Object> paramts = new HashMap<>();
@@ -237,8 +249,9 @@
      * @param modelId
      * @return
      */
-    private static String QUERY_GOODSINFO_BY_MODELID = "SELECT model.MODEL_NAME modelName,model.UNIT,temp.id goodsId, temp.GOODS_CODE goodsCode,temp.GOODS_NAME goodsName,temp.CLASSIFICATION classification,temp.CATEGORY_ID categoryId FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE temp ON model.GOODS_TEMPLATES_ID=temp.id WHERE 1=1 ";
 
+    private static String QUERY_GOODSINFO_BY_MODELID = "SELECT model.MODEL_NAME modelName,model.UNIT,temp.id goodsId, temp.GOODS_CODE goodsCode,temp.GOODS_NAME goodsName,temp.CLASSIFICATION classification,temp.CATEGORY_ID categoryId FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE temp ON model.GOODS_TEMPLATES_ID=temp.id WHERE 1=1 ";
+    @Override
     public Map<String, Object> queryGoodsInfoByModelId(Long modelId) {
         StringBuilder sqlStr = new StringBuilder(QUERY_GOODSINFO_BY_MODELID);
         Map<String, Object> params = new HashMap<>();
@@ -259,6 +272,7 @@
      * @author 鍗㈠簡闃�
      * @date 2023/10/25
      */
+    @Override
     public int updateStatus(BaseGoodsTemplate goodsTemplate) {
         return this.update(goodsTemplate);
     }
@@ -268,6 +282,7 @@
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/25
      */
+    @Override
     public int updateById(BaseGoodsTemplate goodsTemplate, S_user_core currentUser) {
         goodsTemplate.setStates(Constants.STATES_DELETED);
         //鍒犻櫎鏃堕棿
@@ -284,6 +299,7 @@
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/30
      */
+    @Override
     public List<SDictData> queryClassificationCode() {
         StringBuilder sql = new StringBuilder("SELECT * FROM s_dict_data WHERE dict_type = 'CLASSIFICATION_CODE' order by dict_sort");
         return this.select(sql.toString(), new Object[]{}, new SDictData());
@@ -294,6 +310,7 @@
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/30
      */
+    @Override
     public List<BaseGoodsTemplate> queryByCategoryId(Long categoryId) {
         BaseGoodsTemplate goodsTemplate = new BaseGoodsTemplate();
         goodsTemplate.setCategoryId(categoryId);
@@ -307,7 +324,7 @@
      * @param goodsName  鍏ㄥ尮閰嶏紒锛侊紒
      * @return
      */
-
+    @Override
     public List<BaseGoodsTemplate> queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId, Short states, String goodsName) {
         StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1=1 ");
         Map<String, Object> params = new HashMap<>();

--
Gitblit v1.9.1