From cd986a156889642976b12518349c8a8c6a42f81b Mon Sep 17 00:00:00 2001
From: yxt_njy <119782786@qq.com>
Date: Mon, 29 Apr 2024 17:38:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{base => }/BaseCategoryBrandRest.java     |  2 +-
 .../{base => }/BaseGoodsBrandRest.java        |  2 +-
 .../{base => }/BaseGoodsSkuExtendRest.java    |  2 +-
 .../apiadmin/{base => }/BaseGoodsSkuRest.java |  2 +-
 .../{base => }/BaseGoodsSpuDetailRest.java    |  2 +-
 .../apiadmin/{base => }/BaseGoodsSpuRest.java |  2 +-
 .../{base => }/BaseGoodsTypeRest.java         |  2 +-
 .../{base => }/BaseGoodsUnitRest.java         |  2 +-
 .../{base => }/BaseManufacturerRest.java      |  2 +-
 .../{base => }/BaseSpecGroupRest.java         |  2 +-
 .../{base => }/BaseSpecParamRest.java         |  2 +-
 .../{base => }/BaseSupplierBankRest.java      |  2 +-
 .../{base => }/BaseSupplierFileRest.java      |  2 +-
 .../{base => }/BaseSupplierInfoRest.java      |  2 +-
 .../{base => }/BaseSupplierTypeRest.java      |  2 +-
 .../apiadmin/{base => }/ShoppingCartRest.java |  2 +-
 .../basebrandinfo/BaseBrandInfoService.java   | 22 ++++++++++---------
 .../BaseSupplierTypeDetailsVo.java            |  9 ++++----
 18 files changed, 32 insertions(+), 31 deletions(-)
 rename src/main/java/com/yxt/goods/apiadmin/{base => }/BaseCategoryBrandRest.java (98%)
 rename src/main/java/com/yxt/goods/apiadmin/{base => }/BaseGoodsBrandRest.java (98%)
 rename src/main/java/com/yxt/goods/apiadmin/{base => }/BaseGoodsSkuExtendRest.java (98%)
 rename src/main/java/com/yxt/goods/apiadmin/{base => }/BaseGoodsSkuRest.java (98%)
 rename src/main/java/com/yxt/goods/apiadmin/{base => }/BaseGoodsSpuDetailRest.java (97%)
 rename src/main/java/com/yxt/goods/apiadmin/{base => }/BaseGoodsSpuRest.java (98%)
 rename src/main/java/com/yxt/goods/apiadmin/{base => }/BaseGoodsTypeRest.java (98%)
 rename src/main/java/com/yxt/goods/apiadmin/{base => }/BaseGoodsUnitRest.java (98%)
 rename src/main/java/com/yxt/goods/apiadmin/{base => }/BaseManufacturerRest.java (98%)
 rename src/main/java/com/yxt/goods/apiadmin/{base => }/BaseSpecGroupRest.java (98%)
 rename src/main/java/com/yxt/goods/apiadmin/{base => }/BaseSpecParamRest.java (98%)
 rename src/main/java/com/yxt/goods/apiadmin/{base => }/BaseSupplierBankRest.java (98%)
 rename src/main/java/com/yxt/goods/apiadmin/{base => }/BaseSupplierFileRest.java (98%)
 rename src/main/java/com/yxt/goods/apiadmin/{base => }/BaseSupplierInfoRest.java (99%)
 rename src/main/java/com/yxt/goods/apiadmin/{base => }/BaseSupplierTypeRest.java (98%)
 rename src/main/java/com/yxt/goods/apiadmin/{base => }/ShoppingCartRest.java (98%)

diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseCategoryBrandRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseCategoryBrandRest.java
similarity index 98%
rename from src/main/java/com/yxt/goods/apiadmin/base/BaseCategoryBrandRest.java
rename to src/main/java/com/yxt/goods/apiadmin/BaseCategoryBrandRest.java
index 7a43af9..2c473bc 100644
--- a/src/main/java/com/yxt/goods/apiadmin/base/BaseCategoryBrandRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/BaseCategoryBrandRest.java
@@ -1,4 +1,4 @@
-package com.yxt.goods.apiadmin.base;
+package com.yxt.goods.apiadmin;
 
 import com.yxt.goods.biz.base.basecategorybrand.BaseCategoryBrandDto;
 import com.yxt.goods.biz.base.basecategorybrand.BaseCategoryBrandQuery;
diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsBrandRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseGoodsBrandRest.java
similarity index 98%
rename from src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsBrandRest.java
rename to src/main/java/com/yxt/goods/apiadmin/BaseGoodsBrandRest.java
index 281c214..0870247 100644
--- a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsBrandRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/BaseGoodsBrandRest.java
@@ -1,4 +1,4 @@
-package com.yxt.goods.apiadmin.base;
+package com.yxt.goods.apiadmin;
 
 import com.yxt.goods.biz.base.basebrandinfo.*;
 import com.yxt.common.core.query.PagerQuery;
diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsSkuExtendRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseGoodsSkuExtendRest.java
similarity index 98%
rename from src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsSkuExtendRest.java
rename to src/main/java/com/yxt/goods/apiadmin/BaseGoodsSkuExtendRest.java
index 219e64a..f2f460c 100644
--- a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsSkuExtendRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/BaseGoodsSkuExtendRest.java
@@ -1,4 +1,4 @@
-package com.yxt.goods.apiadmin.base;
+package com.yxt.goods.apiadmin;
 
 import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendDto;
 import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendQuery;
diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsSkuRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseGoodsSkuRest.java
similarity index 98%
rename from src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsSkuRest.java
rename to src/main/java/com/yxt/goods/apiadmin/BaseGoodsSkuRest.java
index 1032668..7367a9a 100644
--- a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsSkuRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/BaseGoodsSkuRest.java
@@ -1,4 +1,4 @@
-package com.yxt.goods.apiadmin.base;
+package com.yxt.goods.apiadmin;
 
 import com.yxt.goods.biz.base.basegoodssku.*;
 import com.yxt.common.core.query.PagerQuery;
diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsSpuDetailRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseGoodsSpuDetailRest.java
similarity index 97%
rename from src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsSpuDetailRest.java
rename to src/main/java/com/yxt/goods/apiadmin/BaseGoodsSpuDetailRest.java
index bd78681..5b7275c 100644
--- a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsSpuDetailRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/BaseGoodsSpuDetailRest.java
@@ -1,4 +1,4 @@
-package com.yxt.goods.apiadmin.base;
+package com.yxt.goods.apiadmin;
 
 import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetailDto;
 import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetailQuery;
diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsSpuRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseGoodsSpuRest.java
similarity index 98%
rename from src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsSpuRest.java
rename to src/main/java/com/yxt/goods/apiadmin/BaseGoodsSpuRest.java
index 76d1a87..5bf4824 100644
--- a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsSpuRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/BaseGoodsSpuRest.java
@@ -1,4 +1,4 @@
-package com.yxt.goods.apiadmin.base;
+package com.yxt.goods.apiadmin;
 
 import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpuDto;
 import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpuQuery;
diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsTypeRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseGoodsTypeRest.java
similarity index 98%
rename from src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsTypeRest.java
rename to src/main/java/com/yxt/goods/apiadmin/BaseGoodsTypeRest.java
index 34fc20e..462e8af 100644
--- a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsTypeRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/BaseGoodsTypeRest.java
@@ -1,4 +1,4 @@
-package com.yxt.goods.apiadmin.base;
+package com.yxt.goods.apiadmin;
 
 import com.yxt.goods.biz.base.basegoodstype.*;
 import com.yxt.common.core.query.PagerQuery;
diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsUnitRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseGoodsUnitRest.java
similarity index 98%
rename from src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsUnitRest.java
rename to src/main/java/com/yxt/goods/apiadmin/BaseGoodsUnitRest.java
index 1356a06..a2f3594 100644
--- a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsUnitRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/BaseGoodsUnitRest.java
@@ -1,4 +1,4 @@
-package com.yxt.goods.apiadmin.base;
+package com.yxt.goods.apiadmin;
 
 import com.yxt.goods.biz.base.basegoodsunit.*;
 import com.yxt.common.core.query.PagerQuery;
diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseManufacturerRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseManufacturerRest.java
similarity index 98%
rename from src/main/java/com/yxt/goods/apiadmin/base/BaseManufacturerRest.java
rename to src/main/java/com/yxt/goods/apiadmin/BaseManufacturerRest.java
index 711524d..bc71035 100644
--- a/src/main/java/com/yxt/goods/apiadmin/base/BaseManufacturerRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/BaseManufacturerRest.java
@@ -1,4 +1,4 @@
-package com.yxt.goods.apiadmin.base;
+package com.yxt.goods.apiadmin;
 
 import com.yxt.goods.biz.base.basemanufacturer.*;
 import com.yxt.common.core.query.PagerQuery;
diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseSpecGroupRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseSpecGroupRest.java
similarity index 98%
rename from src/main/java/com/yxt/goods/apiadmin/base/BaseSpecGroupRest.java
rename to src/main/java/com/yxt/goods/apiadmin/BaseSpecGroupRest.java
index bead21c..fa99a35 100644
--- a/src/main/java/com/yxt/goods/apiadmin/base/BaseSpecGroupRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/BaseSpecGroupRest.java
@@ -1,4 +1,4 @@
-package com.yxt.goods.apiadmin.base;
+package com.yxt.goods.apiadmin;
 
 
 import com.yxt.goods.biz.base.basespecparam.BaseSpecParamDto;
diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseSpecParamRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseSpecParamRest.java
similarity index 98%
rename from src/main/java/com/yxt/goods/apiadmin/base/BaseSpecParamRest.java
rename to src/main/java/com/yxt/goods/apiadmin/BaseSpecParamRest.java
index ebfa882..5807765 100644
--- a/src/main/java/com/yxt/goods/apiadmin/base/BaseSpecParamRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/BaseSpecParamRest.java
@@ -1,4 +1,4 @@
-package com.yxt.goods.apiadmin.base;
+package com.yxt.goods.apiadmin;
 
 
 import com.yxt.goods.biz.base.basespecparam.BaseSpecParamDto;
diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseSupplierBankRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseSupplierBankRest.java
similarity index 98%
rename from src/main/java/com/yxt/goods/apiadmin/base/BaseSupplierBankRest.java
rename to src/main/java/com/yxt/goods/apiadmin/BaseSupplierBankRest.java
index 0edf42f..3c9c743 100644
--- a/src/main/java/com/yxt/goods/apiadmin/base/BaseSupplierBankRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/BaseSupplierBankRest.java
@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.goods.apiadmin.base;
+package com.yxt.goods.apiadmin;
 
 import com.yxt.goods.biz.base.basesupplierBank.*;
 import com.yxt.common.core.query.PagerQuery;
diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseSupplierFileRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseSupplierFileRest.java
similarity index 98%
rename from src/main/java/com/yxt/goods/apiadmin/base/BaseSupplierFileRest.java
rename to src/main/java/com/yxt/goods/apiadmin/BaseSupplierFileRest.java
index 12cd199..af59a69 100644
--- a/src/main/java/com/yxt/goods/apiadmin/base/BaseSupplierFileRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/BaseSupplierFileRest.java
@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.goods.apiadmin.base;
+package com.yxt.goods.apiadmin;
 
 import com.yxt.goods.biz.base.basesupplierfile.*;
 import com.yxt.common.core.query.PagerQuery;
diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseSupplierInfoRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseSupplierInfoRest.java
similarity index 99%
rename from src/main/java/com/yxt/goods/apiadmin/base/BaseSupplierInfoRest.java
rename to src/main/java/com/yxt/goods/apiadmin/BaseSupplierInfoRest.java
index d82e1c4..2266664 100644
--- a/src/main/java/com/yxt/goods/apiadmin/base/BaseSupplierInfoRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/BaseSupplierInfoRest.java
@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.goods.apiadmin.base;
+package com.yxt.goods.apiadmin;
 
 import com.yxt.goods.biz.base.basesupplierinfo.*;
 import com.yxt.common.core.query.PagerQuery;
diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseSupplierTypeRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseSupplierTypeRest.java
similarity index 98%
rename from src/main/java/com/yxt/goods/apiadmin/base/BaseSupplierTypeRest.java
rename to src/main/java/com/yxt/goods/apiadmin/BaseSupplierTypeRest.java
index be838c5..b0fe8d6 100644
--- a/src/main/java/com/yxt/goods/apiadmin/base/BaseSupplierTypeRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/BaseSupplierTypeRest.java
@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.goods.apiadmin.base;
+package com.yxt.goods.apiadmin;
 
 import com.yxt.goods.biz.base.basesuppliertype.*;
 import com.yxt.common.core.query.PagerQuery;
diff --git a/src/main/java/com/yxt/goods/apiadmin/base/ShoppingCartRest.java b/src/main/java/com/yxt/goods/apiadmin/ShoppingCartRest.java
similarity index 98%
rename from src/main/java/com/yxt/goods/apiadmin/base/ShoppingCartRest.java
rename to src/main/java/com/yxt/goods/apiadmin/ShoppingCartRest.java
index 593385e..c3eecfa 100644
--- a/src/main/java/com/yxt/goods/apiadmin/base/ShoppingCartRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/ShoppingCartRest.java
@@ -1,4 +1,4 @@
-package com.yxt.goods.apiadmin.base;
+package com.yxt.goods.apiadmin;
 
 
 import com.yxt.common.core.result.ResultBean;
diff --git a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoService.java b/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoService.java
index 0830b66..ee68ca3 100644
--- a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoService.java
+++ b/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoService.java
@@ -33,8 +33,8 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
         BaseBrandInfoQuery query = pq.getParams();
         QueryWrapper<BaseBrandInfo> qw = new QueryWrapper<>();
 
-        if(StringUtils.isNotBlank(query.getName())){
-            qw.like("brandName",query.getName());
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("brandName", query.getName());
         }
         IPage<BaseBrandInfo> page = PagerUtil.queryToPage(pq);
         IPage<BaseBrandInfoVo> pagging = baseMapper.listPage(page, qw);
@@ -50,11 +50,13 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
 //        }
         return rb.success().setData(p);
     }
+
     public ResultBean<List<BaseBrandInfo>> listAll() {
-    ResultBean rb = ResultBean.fireFail();
-    List<BaseBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<BaseBrandInfo>().eq("isEnable",1));
-    return rb.success().setData(pagging);
-}
+        ResultBean rb = ResultBean.fireFail();
+        List<BaseBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<BaseBrandInfo>().eq("isEnable", 1));
+        return rb.success().setData(pagging);
+    }
+
     public ResultBean<String> saveOrUpdate(BaseBrandInfoDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = "";
@@ -70,8 +72,8 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
             wmsGoodsBrand.setModifyTime(new Date());
             baseMapper.updateById(wmsGoodsBrand);
         } else {
-            BaseBrandInfo goods=baseMapper.selectOne(new QueryWrapper<BaseBrandInfo>().eq("name",dto.getBrandName()));
-            if(null!=goods){
+            BaseBrandInfo goods = baseMapper.selectOne(new QueryWrapper<BaseBrandInfo>().eq("name", dto.getBrandName()));
+            if (null != goods) {
                 return rb.setMsg("商品名不能重复");
             }
             BaseBrandInfo wmsGoodsBrand = new BaseBrandInfo();
@@ -105,7 +107,6 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
     }
 
 
-
     public ResultBean delete(String sid) {
         ResultBean rb = ResultBean.fireFail();
         BaseBrandInfo wmsGoodsBrand = fetchBySid(sid);
@@ -114,7 +115,8 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
         }
         return rb.success().setMsg("成功");
     }
-    public ResultBean updateIsEnable(String sid,String isEnable) {
+
+    public ResultBean updateIsEnable(String sid, String isEnable) {
         ResultBean rb = ResultBean.fireFail();
         BaseBrandInfo wmsGoodsBrand = fetchBySid(sid);
         if (null != wmsGoodsBrand) {
diff --git a/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeDetailsVo.java b/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeDetailsVo.java
index 322a9c4..bfa4ba0 100644
--- a/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeDetailsVo.java
+++ b/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeDetailsVo.java
@@ -47,16 +47,15 @@ import lombok.Data;
 @Data
 @ApiModel(value = "供应商类型 视图数据详情", description = "供应商类型 视图数据详情")
 public class BaseSupplierTypeDetailsVo implements Vo {
-
     private String sid; // sid
 
-	@ApiModelProperty("供应商类型名称")
+    @ApiModelProperty("供应商类型名称")
     private String supplierTypeName; // 供应商类型名称
-	@ApiModelProperty("使用组织sid")
+    @ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
 
 }
\ No newline at end of file