From 24c4699005da96f45562d7057d80c103b8e428a2 Mon Sep 17 00:00:00 2001
From: WangHan <wwh_work@126,com>
Date: 星期五, 03 一月 2025 10:32:34 +0800
Subject: [PATCH] 子级分类在用删除

---
 consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java |   70 ++++++++++++++++++++++++++---------
 1 files changed, 52 insertions(+), 18 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 a1eb96a..099c6a2 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
@@ -1,33 +1,37 @@
 package com.consum.base.controller;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.consum.base.BaseController;
-import com.consum.base.pojo.BaseCategoryParam;
-import com.consum.base.service.BaseCategoryServiceImpl;
-import com.consum.base.service.BaseGoodsModelsServiceImpl;
-import com.consum.base.service.BaseGoodsTemplateServiceImpl;
-import com.consum.model.po.BaseCategory;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.service.BaseGoodsModelsService;
 import com.consum.model.po.BaseGoodsModels;
 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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
+import io.swagger.annotations.Api;
 
 /**
  * @Description 瑙勬牸鍨嬪彿
  * @Author 鍗㈠簡闃�
  * @Date 2023/10/25
  */
+@Api(value = "瑙勬牸鍨嬪彿", tags = "瑙勬牸鍨嬪彿")
 @RestController
 @RequestMapping("/pc/base/goods/models")
 public class BaseGoodsModelsController extends BaseController {
 
     @Autowired
-    private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+    private BaseGoodsModelsService baseGoodsModelsService;
 
     /**
      * @Description 瑙勬牸鍒楄〃鏌ヨ锛堟牴鎹墿鍝乮d鏌ヨ瑙勬牸鍨嬪彿锛�
@@ -53,29 +57,43 @@
      * @Date 2023/10/23
      */
     @PostMapping("/add")
-    public ResponseValue add(@RequestBody BaseGoodsModels models) {
-        if (models.getGoodsTemplatesId() == null || StringUtils.isEmpty(models.getModelName()) || StringUtils.isEmpty(models.getUnit()) || models.getStates() == null) {
+    public ResponseValue add() {
+        BaseGoodsModels models = CommonUtil.getObjFromReqBody(BaseGoodsModels.class);
+        BaseGoodsModels param2 = new BaseGoodsModels();
+        CommonUtil.copyProperties(models, param2);
+        models = param2;
+
+        if (models.getGoodsTemplatesId() == null || StringUtils.isEmpty(models.getModelName())
+            || StringUtils.isEmpty(models.getUnit()) || models.getStates() == null) {
             return ResponseValue.error("鍙傛暟閿欒");
         }
-        //鍒ゆ柇鍚屼竴鐗╁搧妯℃澘id涓嬬殑 瑙勬牸鍨嬪彿鍚嶇О鏄惁閲嶅
+        // 鍒ゆ柇鍚屼竴鐗╁搧妯℃澘id涓嬬殑 瑙勬牸鍨嬪彿鍚嶇О鏄惁閲嶅
         BaseGoodsModels baseGoodsModels = this.baseGoodsModelsService.getByModelNameAndGoodsTemplatesId(models);
         if (baseGoodsModels != null) {
             return ResponseValue.error("瑙勬牸鍨嬪彿鍚嶇О宸插瓨鍦�");
         }
 
         int result = this.baseGoodsModelsService.add(models);
-        if (result > 0) return ResponseValue.success(1);
+        if (result > 0) {
+            return ResponseValue.success();
+        }
         return ResponseValue.error("鏂板澶辫触锛�");
     }
 
     /**
      * 淇敼鐘舵��
+     * 
      * @author 鍗㈠簡闃�
      * @date 2023/10/25
      */
     @PostMapping("/updStatus")
-    public ResponseValue updateStatus(@RequestBody BaseGoodsModels models) {
-        if (models == null || models.getId() == null || models.getStates() == null) {
+    public ResponseValue updateStatus() {
+        BaseGoodsModels models = CommonUtil.getObjFromReqBody(BaseGoodsModels.class);
+        BaseGoodsModels param2 = new BaseGoodsModels();
+        CommonUtil.copyProperties(models, param2);
+        models = param2;
+
+        if (models.getId() == null || models.getStates() == null) {
             return ResponseValue.error("鍙傛暟閿欒");
         }
 
@@ -89,7 +107,12 @@
      * @Date 2023/10/25
      */
     @DeleteMapping("/del")
-    public ResponseValue updateById(@RequestBody BaseGoodsModels models) {
+    public ResponseValue updateById() {
+        BaseGoodsModels models = CommonUtil.getObjFromReqBody(BaseGoodsModels.class);
+        BaseGoodsModels param2 = new BaseGoodsModels();
+        CommonUtil.copyProperties(models, param2);
+        models = param2;
+
         if (models.getId() == null) {
             return ResponseValue.error("瑙勬牸鍨嬪彿id涓虹┖");
         }
@@ -98,6 +121,17 @@
         return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
     }
 
+    @GetMapping("query/goodsModel")
+    public ResponseValue queryGoodsModelByGoodsTemplatesId(Long goodsTemplatesId) {
+        List<BaseGoodsModels> result = baseGoodsModelsService.queryGoodsModelByGoodsTemplatesId(goodsTemplatesId);
+        return ResponseValue.success(result);
+    }
 
+    @GetMapping("queryGoodsModelInfo")
+    public ResponseValue queryGoodsModelInfo(Long baseGoodsModelsId) {
+        if (baseGoodsModelsId == null) {
+            return ResponseValue.error("鍙傛暟涓嶈兘涓虹┖锛�");
+        }
+        return ResponseValue.success(baseGoodsModelsService.queryGoodsModelInfo(baseGoodsModelsId));
+    }
 }
-

--
Gitblit v1.9.1