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/controller/BaseGoodsTemplateController.java |   66 ++++++++++++++++++++++++++++----
 1 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
index fb77aa9..a9747e1 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
@@ -1,22 +1,25 @@
 package com.consum.base.controller;
 
 import com.consum.base.BaseController;
-import com.consum.base.pojo.BaseCategoryParam;
 import com.consum.base.pojo.BaseGoodsTemplateParam;
-import com.consum.base.service.BaseCategoryServiceImpl;
 import com.consum.base.service.BaseGoodsTemplateServiceImpl;
-import com.consum.model.po.BaseCategory;
+import com.consum.model.po.BaseGoodsModels;
 import com.consum.model.po.BaseGoodsTemplate;
+import com.consum.model.po.S_dict_data;
 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.StringUtils;
 import com.walker.web.ResponseValue;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Description 鐗╁搧妯℃澘
@@ -50,7 +53,9 @@
         }
 
         int result = this.baseGoodsTemplateService.add(param, this.getCurrentUser());
-        if (result > 0) return ResponseValue.success(1);
+        if (result > 0) {
+            return ResponseValue.success(1);
+        }
         return ResponseValue.error("鏂板澶辫触锛�");
     }
 
@@ -71,6 +76,7 @@
 
     /**
      * 鏍规嵁鐗╁搧id鏌ヨ鐗╁搧璇︽儏
+     *
      * @author 鍗㈠簡闃�
      * @date 2023/9/26
      */
@@ -80,7 +86,9 @@
             return ResponseValue.error("鐗╁搧id涓虹┖");
         }
         BaseGoodsTemplateVo vo = this.baseGoodsTemplateService.getById(id);
-        if (vo == null) return ResponseValue.error("鏌ヨ澶辫触锛�");
+        if (vo == null) {
+            return ResponseValue.error("鏌ヨ澶辫触锛�");
+        }
         return ResponseValue.success("鏌ヨ鎴愬姛!", vo);
     }
 
@@ -94,6 +102,10 @@
         if (StringUtils.isEmpty(param.getGoodsName())) {
             return ResponseValue.error("鐗╁搧鍚嶇О涓虹┖");
         }
+        List<BaseGoodsModels> models = param.getModels();
+        if (CollectionUtils.isEmpty(models)) {
+            return ResponseValue.error("鐗╁搧鍨嬪彿涓虹┖");
+        }
 
         int num = this.baseGoodsTemplateService.updateBaseGoodsTemplate(param);
         return num > 0 ? ResponseValue.success(1) : ResponseValue.error("缂栬緫澶辫触锛�");
@@ -101,6 +113,7 @@
 
     /**
      * 淇敼鐘舵��
+     *
      * @author 鍗㈠簡闃�
      * @date 2023/10/25
      */
@@ -126,10 +139,45 @@
         if (goodsTemplate.getId() == null) {
             return ResponseValue.error("鐗╁搧id涓虹┖");
         }
-        int num = this.baseGoodsTemplateService.updateById(goodsTemplate,this.getCurrentUser());
+        int num = this.baseGoodsTemplateService.updateById(goodsTemplate, this.getCurrentUser());
 
         return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
     }
 
+    /**
+     * @Description 鏌ヨ浠撳簱绫诲瀷(鏁版嵁瀛楀吀)
+     * @Author 鍗㈠簡闃�
+     * @Date 2023/10/30
+     */
+    @GetMapping("/select/classificationCode")
+    public ResponseValue queryClassificationCode() {
+        List<S_dict_data> list = this.baseGoodsTemplateService.queryClassificationCode();
+        return ResponseValue.success(list);
+    }
+
+    /**
+     * @Description 鏍规嵁鍒嗙被id鏌ヨ鐗╁搧妯℃澘
+     * @Author 鍗㈠簡闃�
+     * @Date 2023/10/30
+     */
+    @GetMapping("/selectByCategoryId")
+    public ResponseValue queryByCategoryId(Long categoryId) {
+        List<BaseGoodsTemplate> list = this.baseGoodsTemplateService.queryByCategoryId(categoryId);
+        return ResponseValue.success(list);
+    }
+
+    @GetMapping("/query/goodsTemplate")
+    public ResponseValue queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId) {
+//        if (agencyId == null) {
+//            return ResponseValue.error("鏈烘瀯id涓虹┖");
+//        }
+        List<BaseGoodsTemplate> list = this.baseGoodsTemplateService.queryGoodsTemplateByCategoryId(agencyId, categoryId);
+        if (list == null) {
+            return ResponseValue.error("鏌ヨ澶辫触锛�");
+        }
+        return ResponseValue.success("鏌ヨ鎴愬姛!", list);
+    }
+
+
 }
 

--
Gitblit v1.9.1