From 22a8621ee2b1bb3d4b84e686cd7190b7470fee19 Mon Sep 17 00:00:00 2001 From: yxt_njy <119782786@qq.com> Date: Mon, 29 Apr 2024 18:11:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AD=90=E6=9C=8D=E5=8A=A1=E7=9A=84=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/BaseGoodsSkuExtendRest.java | 63 ----- .../goods/apiadmin/BaseSupplierBankRest.java | 89 ------- .../goods/apiadmin/BaseSupplierFileRest.java | 89 ------- .../goods/apiadmin/BaseSupplierInfoRest.java | 97 -------- .../goods/apiadmin/BaseSupplierTypeRest.java | 89 ------- ...nHomeRest.java => GoodsAdminHomeRest.java} | 2 +- ...oodsBrandRest.java => GoodsBrandRest.java} | 17 +- ...dRest.java => GoodsCategoryBrandRest.java} | 18 +- ...erRest.java => GoodsManufacturerRest.java} | 19 +- ...rtRest.java => GoodsShoppingCartRest.java} | 20 +- .../goods/apiadmin/GoodsSkuExtendRest.java | 62 +++++ ...aseGoodsSkuRest.java => GoodsSkuRest.java} | 43 ++-- ...GroupRest.java => GoodsSpecGroupRest.java} | 28 +-- ...ParamRest.java => GoodsSpecParamRest.java} | 28 +-- ...etailRest.java => GoodsSpuDetailRest.java} | 16 +- ...aseGoodsSpuRest.java => GoodsSpuRest.java} | 34 +-- ...eGoodsTypeRest.java => GoodsTypeRest.java} | 31 +-- ...eGoodsUnitRest.java => GoodsUnitRest.java} | 31 +-- .../base/basegoodssku/BaseGoodsSkuMapper.java | 26 -- .../BaseGoodsSkuExtendMapper.java | 20 -- .../BaseGoodsSkuExtendQuery.java | 13 - .../basegoodsunit/BaseGoodsUnitQuery.java | 13 - .../BaseManufacturerQuery.java | 13 - .../basesupplierBank/BaseSupplierBank.java | 76 ------ .../BaseSupplierBankDetailsVo.java | 76 ------ .../basesupplierBank/BaseSupplierBankDto.java | 76 ------ .../BaseSupplierBankMapper.java | 67 ----- .../BaseSupplierBankMapper.xml | 13 - .../BaseSupplierBankQuery.java | 74 ------ .../BaseSupplierBankService.java | 104 -------- .../basesupplierBank/BaseSupplierBankVo.java | 76 ------ .../basesupplierfile/BaseSupplierFile.java | 66 ----- .../BaseSupplierFileDetailsVo.java | 66 ----- .../basesupplierfile/BaseSupplierFileDto.java | 66 ----- .../BaseSupplierFileMapper.java | 60 ----- .../BaseSupplierFileMapper.xml | 13 - .../BaseSupplierFileQuery.java | 64 ----- .../BaseSupplierFileService.java | 94 ------- .../basesupplierfile/BaseSupplierFileVo.java | 66 ----- .../basesupplierinfo/BaseSupplierInfo.java | 112 --------- .../BaseSupplierInfoChoice.java | 54 ---- .../BaseSupplierInfoDetailsVo.java | 116 --------- .../basesupplierinfo/BaseSupplierInfoDto.java | 116 --------- .../BaseSupplierInfoMapper.java | 67 ----- .../BaseSupplierInfoMapper.xml | 13 - .../BaseSupplierInfoQuery.java | 62 ----- .../BaseSupplierInfoService.java | 168 ------------- .../basesupplierinfo/BaseSupplierInfoVo.java | 65 ----- .../basesuppliertype/BaseSupplierType.java | 62 ----- .../BaseSupplierTypeDetailsVo.java | 61 ----- .../basesuppliertype/BaseSupplierTypeDto.java | 62 ----- .../BaseSupplierTypeMapper.java | 60 ----- .../BaseSupplierTypeMapper.xml | 13 - .../BaseSupplierTypeQuery.java | 60 ----- .../BaseSupplierTypeService.java | 94 ------- .../basesuppliertype/BaseSupplierTypeVo.java | 62 ----- .../base/shoppingcart/ShoppingCartMapper.java | 18 -- .../base/shoppingcart/ShoppingGoodsVo.java | 8 - .../GoodsBrandInfo.java} | 4 +- .../GoodsBrandInfoDto.java} | 4 +- .../GoodsBrandInfoMapper.java} | 7 +- .../GoodsBrandInfoMapper.xml} | 4 +- .../GoodsBrandInfoQuery.java} | 4 +- .../GoodsBrandInfoService.java} | 45 ++-- .../GoodsBrandInfoVo.java} | 4 +- .../GoodsCategoryBrand.java} | 4 +- .../GoodsCategoryBrandDto.java} | 4 +- .../GoodsCategoryBrandMapper.java} | 10 +- .../GoodsCategoryBrandMapper.xml} | 8 +- .../GoodsCategoryBrandQuery.java} | 4 +- .../GoodsCategoryBrandService.java} | 44 ++-- .../GoodsCategoryBrandVo.java} | 4 +- .../GoodsManufacturer.java} | 4 +- .../GoodsManufacturerDto.java} | 4 +- .../GoodsManufacturerMapper.java} | 8 +- .../GoodsManufacturerMapper.xml} | 6 +- .../GoodsManufacturerQuery.java | 13 + .../GoodsManufacturerService.java} | 47 ++-- .../GoodsManufacturerVo.java} | 4 +- .../GoodsShoppingCart.java} | 4 +- .../GoodsShoppingCartDto.java} | 4 +- .../GoodsShoppingCartMapper.java | 18 ++ .../GoodsShoppingCartMapper.xml} | 4 +- .../GoodsShoppingCartQuery.java} | 4 +- .../GoodsShoppingCartService.java} | 40 +-- .../GoodsShoppingCartVo.java} | 4 +- .../GoodsShoppingGoodsVo.java | 8 + .../GoodsSku.java} | 4 +- .../GoodsSkuDetailsVo.java} | 4 +- .../GoodsSkuDto.java} | 8 +- .../goods/biz/goodssku/GoodsSkuMapper.java | 26 ++ .../GoodsSkuMapper.xml} | 12 +- .../GoodsSkuPurSelectList.java} | 4 +- .../GoodsSkuPurSelectQuery.java} | 4 +- .../GoodsSkuQuery.java} | 4 +- .../GoodsSkuSelectQuery.java} | 4 +- .../GoodsSkuService.java} | 143 ++++++----- .../GoodsSkuVo.java} | 8 +- .../SkuSelectList.java} | 4 +- .../GoodsSkuExtend.java} | 4 +- .../GoodsSkuExtendDto.java} | 4 +- .../goodsskuextend/GoodsSkuExtendMapper.java | 20 ++ .../GoodsSkuExtendMapper.xml} | 8 +- .../GoodsSkuExtendQuery.java} | 4 +- .../GoodsSkuExtendService.java} | 64 +++-- .../GoodsSkuExtendVo.java} | 4 +- .../UrlsVo.java | 2 +- .../GoodsSpecGroup.java} | 4 +- .../GoodsSpecGroupDto.java} | 4 +- .../GoodsSpecGroupMapper.java} | 10 +- .../GoodsSpecGroupMapper.xml} | 8 +- .../GoodsSpecGroupQuery.java} | 4 +- .../GoodsSpecGroupService.java} | 44 ++-- .../GoodsSpecGroupVo.java} | 4 +- .../GoodsSpecParam.java} | 4 +- .../GoodsSpecParamDto.java} | 4 +- .../GoodsSpecParamMapper.java} | 10 +- .../GoodsSpecParamMapper.xml} | 8 +- .../GoodsSpecParamQuery.java} | 4 +- .../GoodsSpecParamService.java} | 44 ++-- .../GoodsSpecParamVo.java} | 4 +- .../GoodsSpu.java} | 4 +- .../GoodsSpuDto.java} | 12 +- .../GoodsSpuMapper.java} | 8 +- .../GoodsSpuMapper.xml} | 6 +- .../GoodsSpuQuery.java} | 4 +- .../GoodsSpuService.java} | 234 +++++++++--------- .../GoodsSpuVo.java} | 10 +- .../BaseGoodsSpuDetailQuery.java | 2 +- .../BaseGoodsSpuDetailService.java | 71 +++--- .../BaseGoodsSpuDetailVo.java | 2 +- .../GoodsSpuDetail.java} | 4 +- .../GoodsSpuDetailDto.java} | 4 +- .../GoodsSpuDetailMapper.java} | 6 +- .../GoodsSpuDetailMapper.xml} | 6 +- .../GoodsType.java} | 4 +- .../GoodsTypeDto.java} | 4 +- .../GoodsTypeMapper.java} | 7 +- .../GoodsTypeMapper.xml} | 4 +- .../goods/biz/goodstype/GoodsTypeQuery.java | 13 + .../GoodsTypeService.java} | 48 ++-- .../GoodsTypeVo.java} | 4 +- .../GoodsUnit.java} | 4 +- .../GoodsUnitDto.java} | 4 +- .../GoodsUnitMapper.java} | 6 +- .../GoodsUnitMapper.xml} | 4 +- .../goods/biz/goodsunit/GoodsUnitQuery.java | 13 + .../GoodsUnitService.java} | 43 ++-- .../GoodsUnitVo.java} | 4 +- 149 files changed, 934 insertions(+), 3605 deletions(-) delete mode 100644 src/main/java/com/yxt/goods/apiadmin/BaseGoodsSkuExtendRest.java delete mode 100644 src/main/java/com/yxt/goods/apiadmin/BaseSupplierBankRest.java delete mode 100644 src/main/java/com/yxt/goods/apiadmin/BaseSupplierFileRest.java delete mode 100644 src/main/java/com/yxt/goods/apiadmin/BaseSupplierInfoRest.java delete mode 100644 src/main/java/com/yxt/goods/apiadmin/BaseSupplierTypeRest.java rename src/main/java/com/yxt/goods/apiadmin/{AdminHomeRest.java => GoodsAdminHomeRest.java} (88%) rename src/main/java/com/yxt/goods/apiadmin/{BaseGoodsBrandRest.java => GoodsBrandRest.java} (73%) rename src/main/java/com/yxt/goods/apiadmin/{BaseCategoryBrandRest.java => GoodsCategoryBrandRest.java} (67%) rename src/main/java/com/yxt/goods/apiadmin/{BaseManufacturerRest.java => GoodsManufacturerRest.java} (71%) rename src/main/java/com/yxt/goods/apiadmin/{ShoppingCartRest.java => GoodsShoppingCartRest.java} (66%) create mode 100644 src/main/java/com/yxt/goods/apiadmin/GoodsSkuExtendRest.java rename src/main/java/com/yxt/goods/apiadmin/{BaseGoodsSkuRest.java => GoodsSkuRest.java} (50%) rename src/main/java/com/yxt/goods/apiadmin/{BaseSpecGroupRest.java => GoodsSpecGroupRest.java} (55%) rename src/main/java/com/yxt/goods/apiadmin/{BaseSpecParamRest.java => GoodsSpecParamRest.java} (55%) rename src/main/java/com/yxt/goods/apiadmin/{BaseGoodsSpuDetailRest.java => GoodsSpuDetailRest.java} (73%) rename src/main/java/com/yxt/goods/apiadmin/{BaseGoodsSpuRest.java => GoodsSpuRest.java} (62%) rename src/main/java/com/yxt/goods/apiadmin/{BaseGoodsTypeRest.java => GoodsTypeRest.java} (58%) rename src/main/java/com/yxt/goods/apiadmin/{BaseGoodsUnitRest.java => GoodsUnitRest.java} (58%) delete mode 100644 src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuMapper.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtendMapper.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtendQuery.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitQuery.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basemanufacturer/BaseManufacturerQuery.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBank.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankDetailsVo.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankDto.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankMapper.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankMapper.xml delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankQuery.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankService.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankVo.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFile.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileDetailsVo.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileDto.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileMapper.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileMapper.xml delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileQuery.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileService.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileVo.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfo.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoChoice.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoDetailsVo.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoDto.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoMapper.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoMapper.xml delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoQuery.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoService.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoVo.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierType.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeDetailsVo.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeDto.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeMapper.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeMapper.xml delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeQuery.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeService.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeVo.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCartMapper.java delete mode 100644 src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingGoodsVo.java rename src/main/java/com/yxt/goods/biz/{base/basebrandinfo/BaseBrandInfo.java => goodsbrandinfo/GoodsBrandInfo.java} (81%) rename src/main/java/com/yxt/goods/biz/{base/basebrandinfo/BaseBrandInfoDto.java => goodsbrandinfo/GoodsBrandInfoDto.java} (88%) rename src/main/java/com/yxt/goods/biz/{base/basegoodstype/BaseGoodsTypeMapper.java => goodsbrandinfo/GoodsBrandInfoMapper.java} (61%) rename src/main/java/com/yxt/goods/biz/{base/basebrandinfo/BaseBrandInfoMapper.xml => goodsbrandinfo/GoodsBrandInfoMapper.xml} (67%) rename src/main/java/com/yxt/goods/biz/{base/basegoodssku/BaseGoodsSkuQuery.java => goodsbrandinfo/GoodsBrandInfoQuery.java} (61%) rename src/main/java/com/yxt/goods/biz/{base/basebrandinfo/BaseBrandInfoService.java => goodsbrandinfo/GoodsBrandInfoService.java} (71%) rename src/main/java/com/yxt/goods/biz/{base/basebrandinfo/BaseBrandInfoVo.java => goodsbrandinfo/GoodsBrandInfoVo.java} (90%) rename src/main/java/com/yxt/goods/biz/{base/basecategorybrand/BaseCategoryBrand.java => goodscategorybrand/GoodsCategoryBrand.java} (68%) rename src/main/java/com/yxt/goods/biz/{base/basecategorybrand/BaseCategoryBrandDto.java => goodscategorybrand/GoodsCategoryBrandDto.java} (83%) rename src/main/java/com/yxt/goods/biz/{base/basecategorybrand/BaseCategoryBrandMapper.java => goodscategorybrand/GoodsCategoryBrandMapper.java} (50%) rename src/main/java/com/yxt/goods/biz/{base/basecategorybrand/BaseCategoryBrandMapper.xml => goodscategorybrand/GoodsCategoryBrandMapper.xml} (70%) rename src/main/java/com/yxt/goods/biz/{base/basecategorybrand/BaseCategoryBrandQuery.java => goodscategorybrand/GoodsCategoryBrandQuery.java} (58%) rename src/main/java/com/yxt/goods/biz/{base/basecategorybrand/BaseCategoryBrandService.java => goodscategorybrand/GoodsCategoryBrandService.java} (64%) rename src/main/java/com/yxt/goods/biz/{base/basecategorybrand/BaseCategoryBrandVo.java => goodscategorybrand/GoodsCategoryBrandVo.java} (86%) rename src/main/java/com/yxt/goods/biz/{base/basemanufacturer/BaseManufacturer.java => goodsmanufacturer/GoodsManufacturer.java} (82%) rename src/main/java/com/yxt/goods/biz/{base/basemanufacturer/BaseManufacturerDto.java => goodsmanufacturer/GoodsManufacturerDto.java} (90%) rename src/main/java/com/yxt/goods/biz/{base/basemanufacturer/BaseManufacturerMapper.java => goodsmanufacturer/GoodsManufacturerMapper.java} (54%) rename src/main/java/com/yxt/goods/biz/{base/basemanufacturer/BaseManufacturerMapper.xml => goodsmanufacturer/GoodsManufacturerMapper.xml} (68%) create mode 100644 src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerQuery.java rename src/main/java/com/yxt/goods/biz/{base/basemanufacturer/BaseManufacturerService.java => goodsmanufacturer/GoodsManufacturerService.java} (63%) rename src/main/java/com/yxt/goods/biz/{base/basemanufacturer/BaseManufacturerVo.java => goodsmanufacturer/GoodsManufacturerVo.java} (91%) rename src/main/java/com/yxt/goods/biz/{base/shoppingcart/ShoppingCart.java => goodsshoppingcart/GoodsShoppingCart.java} (88%) rename src/main/java/com/yxt/goods/biz/{base/shoppingcart/ShoppingCartDto.java => goodsshoppingcart/GoodsShoppingCartDto.java} (86%) create mode 100644 src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCartMapper.java rename src/main/java/com/yxt/goods/biz/{base/shoppingcart/ShoppingCartMapper.xml => goodsshoppingcart/GoodsShoppingCartMapper.xml} (86%) rename src/main/java/com/yxt/goods/biz/{base/shoppingcart/ShoppingCartQuery.java => goodsshoppingcart/GoodsShoppingCartQuery.java} (72%) rename src/main/java/com/yxt/goods/biz/{base/shoppingcart/ShoppingCartService.java => goodsshoppingcart/GoodsShoppingCartService.java} (86%) rename src/main/java/com/yxt/goods/biz/{base/shoppingcart/ShoppingCartVo.java => goodsshoppingcart/GoodsShoppingCartVo.java} (90%) create mode 100644 src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingGoodsVo.java rename src/main/java/com/yxt/goods/biz/{base/basegoodssku/BaseGoodsSku.java => goodssku/GoodsSku.java} (88%) rename src/main/java/com/yxt/goods/biz/{base/basegoodssku/BaseGoodsSkuDetailsVo.java => goodssku/GoodsSkuDetailsVo.java} (95%) rename src/main/java/com/yxt/goods/biz/{base/basegoodssku/BaseGoodsSkuDto.java => goodssku/GoodsSkuDto.java} (81%) create mode 100644 src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.java rename src/main/java/com/yxt/goods/biz/{base/basegoodssku/BaseGoodsSkuMapper.xml => goodssku/GoodsSkuMapper.xml} (76%) rename src/main/java/com/yxt/goods/biz/{base/basegoodssku/BaseGoodsSkuPurSelectList.java => goodssku/GoodsSkuPurSelectList.java} (88%) rename src/main/java/com/yxt/goods/biz/{base/basegoodssku/BaseGoodsSkuPurSelectQuery.java => goodssku/GoodsSkuPurSelectQuery.java} (83%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsspu/BaseGoodsSpuQuery.java => goodssku/GoodsSkuQuery.java} (61%) rename src/main/java/com/yxt/goods/biz/{base/basegoodssku/BaseGoodsSkuSelectQuery.java => goodssku/GoodsSkuSelectQuery.java} (63%) rename src/main/java/com/yxt/goods/biz/{base/basegoodssku/BaseGoodsSkuService.java => goodssku/GoodsSkuService.java} (52%) rename src/main/java/com/yxt/goods/biz/{base/basegoodssku/BaseGoodsSkuVo.java => goodssku/GoodsSkuVo.java} (84%) rename src/main/java/com/yxt/goods/biz/{base/basegoodssku/BaseGoodsSkuSelectList.java => goodssku/SkuSelectList.java} (88%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsskuextend/BaseGoodsSkuExtend.java => goodsskuextend/GoodsSkuExtend.java} (92%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsskuextend/BaseGoodsSkuExtendDto.java => goodsskuextend/GoodsSkuExtendDto.java} (94%) create mode 100644 src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendMapper.java rename src/main/java/com/yxt/goods/biz/{base/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml => goodsskuextend/GoodsSkuExtendMapper.xml} (72%) rename src/main/java/com/yxt/goods/biz/{base/basebrandinfo/BaseBrandInfoQuery.java => goodsskuextend/GoodsSkuExtendQuery.java} (60%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsskuextend/BaseGoodsSkuExtendService.java => goodsskuextend/GoodsSkuExtendService.java} (66%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsskuextend/BaseGoodsSkuExtendVo.java => goodsskuextend/GoodsSkuExtendVo.java} (94%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsskuextend => goodsskuextend}/UrlsVo.java (72%) rename src/main/java/com/yxt/goods/biz/{base/basespecgroup/BaseSpecGroup.java => goodsspecgroup/GoodsSpecGroup.java} (69%) rename src/main/java/com/yxt/goods/biz/{base/basespecgroup/BaseSpecGroupDto.java => goodsspecgroup/GoodsSpecGroupDto.java} (85%) rename src/main/java/com/yxt/goods/biz/{base/basespecparam/BaseSpecParamMapper.java => goodsspecgroup/GoodsSpecGroupMapper.java} (52%) rename src/main/java/com/yxt/goods/biz/{base/basespecgroup/BaseSpecGroupMapper.xml => goodsspecgroup/GoodsSpecGroupMapper.xml} (67%) rename src/main/java/com/yxt/goods/biz/{base/basespecparam/BaseSpecParamQuery.java => goodsspecgroup/GoodsSpecGroupQuery.java} (60%) rename src/main/java/com/yxt/goods/biz/{base/basespecgroup/BaseSpecGroupService.java => goodsspecgroup/GoodsSpecGroupService.java} (66%) rename src/main/java/com/yxt/goods/biz/{base/basespecgroup/BaseSpecGroupVo.java => goodsspecgroup/GoodsSpecGroupVo.java} (86%) rename src/main/java/com/yxt/goods/biz/{base/basespecparam/BaseSpecParam.java => goodsspecparam/GoodsSpecParam.java} (86%) rename src/main/java/com/yxt/goods/biz/{base/basespecparam/BaseSpecParamDto.java => goodsspecparam/GoodsSpecParamDto.java} (91%) rename src/main/java/com/yxt/goods/biz/{base/basespecgroup/BaseSpecGroupMapper.java => goodsspecparam/GoodsSpecParamMapper.java} (52%) rename src/main/java/com/yxt/goods/biz/{base/basespecparam/BaseSpecParamMapper.xml => goodsspecparam/GoodsSpecParamMapper.xml} (71%) rename src/main/java/com/yxt/goods/biz/{base/basespecgroup/BaseSpecGroupQuery.java => goodsspecparam/GoodsSpecParamQuery.java} (60%) rename src/main/java/com/yxt/goods/biz/{base/basespecparam/BaseSpecParamService.java => goodsspecparam/GoodsSpecParamService.java} (66%) rename src/main/java/com/yxt/goods/biz/{base/basespecparam/BaseSpecParamVo.java => goodsspecparam/GoodsSpecParamVo.java} (92%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsspu/BaseGoodsSpu.java => goodsspu/GoodsSpu.java} (91%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsspu/BaseGoodsSpuDto.java => goodsspu/GoodsSpuDto.java} (78%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsspu/BaseGoodsSpuMapper.java => goodsspu/GoodsSpuMapper.java} (56%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsspu/BaseGoodsSpuMapper.xml => goodsspu/GoodsSpuMapper.xml} (78%) rename src/main/java/com/yxt/goods/biz/{base/basegoodstype/BaseGoodsTypeQuery.java => goodsspu/GoodsSpuQuery.java} (60%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsspu/BaseGoodsSpuService.java => goodsspu/GoodsSpuService.java} (65%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsspu/BaseGoodsSpuVo.java => goodsspu/GoodsSpuVo.java} (85%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsspudetail => goodsspudetail}/BaseGoodsSpuDetailQuery.java (80%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsspudetail => goodsspudetail}/BaseGoodsSpuDetailService.java (60%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsspudetail => goodsspudetail}/BaseGoodsSpuDetailVo.java (95%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsspudetail/BaseGoodsSpuDetail.java => goodsspudetail/GoodsSpuDetail.java} (86%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsspudetail/BaseGoodsSpuDetailDto.java => goodsspudetail/GoodsSpuDetailDto.java} (90%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsspudetail/BaseGoodsSpuDetailMapper.java => goodsspudetail/GoodsSpuDetailMapper.java} (63%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml => goodsspudetail/GoodsSpuDetailMapper.xml} (73%) rename src/main/java/com/yxt/goods/biz/{base/basegoodstype/BaseGoodsType.java => goodstype/GoodsType.java} (87%) rename src/main/java/com/yxt/goods/biz/{base/basegoodstype/BaseGoodsTypeDto.java => goodstype/GoodsTypeDto.java} (91%) rename src/main/java/com/yxt/goods/biz/{base/basebrandinfo/BaseBrandInfoMapper.java => goodstype/GoodsTypeMapper.java} (61%) rename src/main/java/com/yxt/goods/biz/{base/basegoodstype/BaseGoodsTypeMapper.xml => goodstype/GoodsTypeMapper.xml} (67%) create mode 100644 src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeQuery.java rename src/main/java/com/yxt/goods/biz/{base/basegoodstype/BaseGoodsTypeService.java => goodstype/GoodsTypeService.java} (67%) rename src/main/java/com/yxt/goods/biz/{base/basegoodstype/BaseGoodsTypeVo.java => goodstype/GoodsTypeVo.java} (92%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsunit/BaseGoodsUnit.java => goodsunit/GoodsUnit.java} (65%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsunit/BaseGoodsUnitDto.java => goodsunit/GoodsUnitDto.java} (87%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsunit/BaseGoodsUnitMapper.java => goodsunit/GoodsUnitMapper.java} (61%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsunit/BaseGoodsUnitMapper.xml => goodsunit/GoodsUnitMapper.xml} (67%) create mode 100644 src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitQuery.java rename src/main/java/com/yxt/goods/biz/{base/basegoodsunit/BaseGoodsUnitService.java => goodsunit/GoodsUnitService.java} (68%) rename src/main/java/com/yxt/goods/biz/{base/basegoodsunit/BaseGoodsUnitVo.java => goodsunit/GoodsUnitVo.java} (87%) diff --git a/src/main/java/com/yxt/goods/apiadmin/BaseGoodsSkuExtendRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseGoodsSkuExtendRest.java deleted file mode 100644 index 3cccacd..0000000 --- a/src/main/java/com/yxt/goods/apiadmin/BaseGoodsSkuExtendRest.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.yxt.goods.apiadmin; - -import com.yxt.goods.biz.base.basegoodssku.BaseGoodsSkuDto; -import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendDto; -import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendQuery; -import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendService; -import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendVo; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpuDto; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/3/11 15:05 - */ -@Api(tags = "商品sku扩展") -@RestController -@RequestMapping("/apiadmin/base/basegoodsskuextend") -public class BaseGoodsSkuExtendRest { - - @Autowired - BaseGoodsSkuExtendService baseGoodsSkuExtendService; - - @ApiOperation("分页列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - return baseGoodsSkuExtendService.listPage(pq); - } - - @ApiOperation("保存修改") - @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody BaseGoodsSkuExtendDto dto) { - return baseGoodsSkuExtendService.saveOrUpdate(dto); - } - @ApiOperation("保存") - @PostMapping("/batchSave") - public ResultBean batchSave(@RequestBody List dtos) { - return baseGoodsSkuExtendService.skuEBatchSave(dtos); - } - @ApiOperation("初始化") - @GetMapping("/initialization/{sid}") - public ResultBean initialization(@PathVariable("sid") String sid) { - return baseGoodsSkuExtendService.initialization(sid); - } - - @ApiOperation("删除") - @DeleteMapping("/delete/{sid}") - public ResultBean delete(@PathVariable("sid") String sid) { - return baseGoodsSkuExtendService.delete(sid); - } - @ApiOperation("更改可用状态") - @GetMapping("/updateIsEnable/{sid}/{isEnable}") - public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) { - return baseGoodsSkuExtendService.updateIsEnable(sid,isEnable); - } -} diff --git a/src/main/java/com/yxt/goods/apiadmin/BaseSupplierBankRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseSupplierBankRest.java deleted file mode 100644 index 3c9c743..0000000 --- a/src/main/java/com/yxt/goods/apiadmin/BaseSupplierBankRest.java +++ /dev/null @@ -1,89 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.apiadmin; - -import com.yxt.goods.biz.base.basesupplierBank.*; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierBankFeignFallback.java
- * Class: com.yxt.base.biz.basesupplierbank.BaseSupplierBankRest
- * Description: 供应商开户行信息.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Api(tags = "供应商开户行信息") -@RestController -@RequestMapping("/apiadmin/base/basesupplierbank") -public class BaseSupplierBankRest { - - @Autowired - private BaseSupplierBankService baseSupplierBankService; - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = baseSupplierBankService.listPageVo(pq); - return rb.success().setData(pv); - } - - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody BaseSupplierBankDto dto){ - ResultBean rb = ResultBean.fireFail(); - baseSupplierBankService.saveOrUpdateDto(dto); - return rb.success(); - } - - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - baseSupplierBankService.delBySids(sids); - return rb.success(); - } - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - BaseSupplierBankDetailsVo vo = baseSupplierBankService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } -} diff --git a/src/main/java/com/yxt/goods/apiadmin/BaseSupplierFileRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseSupplierFileRest.java deleted file mode 100644 index af59a69..0000000 --- a/src/main/java/com/yxt/goods/apiadmin/BaseSupplierFileRest.java +++ /dev/null @@ -1,89 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.apiadmin; - -import com.yxt.goods.biz.base.basesupplierfile.*; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierFileFeignFallback.java
- * Class: com.yxt.anrui.as.biz.basesupplierfile.BaseSupplierFileRest
- * Description: 供应商附件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Api(tags = "供应商附件") -@RestController -@RequestMapping("/apiadmin/base/basesupplierfile") -public class BaseSupplierFileRest { - - @Autowired - private BaseSupplierFileService baseSupplierFileService; - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = baseSupplierFileService.listPageVo(pq); - return rb.success().setData(pv); - } - - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody BaseSupplierFileDto dto){ - ResultBean rb = ResultBean.fireFail(); - baseSupplierFileService.saveOrUpdateDto(dto); - return rb.success(); - } - - @ApiOperation("根据sid批量删除") - @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - baseSupplierFileService.delBySids(sids); - return rb.success(); - } - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - BaseSupplierFileDetailsVo vo = baseSupplierFileService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } -} diff --git a/src/main/java/com/yxt/goods/apiadmin/BaseSupplierInfoRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseSupplierInfoRest.java deleted file mode 100644 index 2266664..0000000 --- a/src/main/java/com/yxt/goods/apiadmin/BaseSupplierInfoRest.java +++ /dev/null @@ -1,97 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.apiadmin; - -import com.yxt.goods.biz.base.basesupplierinfo.*; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierInfoFeignFallback.java
- * Class: com.yxt.anrui.as.biz.basesupplierinfo.BaseSupplierInfoRest
- * Description: 供应商信息.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Api(tags = "供应商信息") -@RestController -@RequestMapping("/apiadmin/base/basesupplierinfo") -public class BaseSupplierInfoRest { - - @Autowired - private BaseSupplierInfoService baseSupplierInfoService; - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = baseSupplierInfoService.listPageVo(pq); - return rb.success().setData(pv); - } - - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody BaseSupplierInfoDto dto){ - return baseSupplierInfoService.saveOrUpdateDto(dto); - } - - @ApiOperation("根据sid批量删除") - @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - baseSupplierInfoService.delAll(sids); - return rb.success(); - } - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - BaseSupplierInfoDetailsVo vo = baseSupplierInfoService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } - - @ApiOperation("选择供应商") - @PostMapping("/choiceSupplierInfo") - public ResultBean> choiceSupplierInfo(@RequestParam("createOrgSid") String createOrgSid){ - ResultBean rb = ResultBean.fireFail(); - List baseSupplierInfoChoiceList = baseSupplierInfoService.choiceSupplierInfo(createOrgSid); - return rb.success().setData(baseSupplierInfoChoiceList); - } -} diff --git a/src/main/java/com/yxt/goods/apiadmin/BaseSupplierTypeRest.java b/src/main/java/com/yxt/goods/apiadmin/BaseSupplierTypeRest.java deleted file mode 100644 index b0fe8d6..0000000 --- a/src/main/java/com/yxt/goods/apiadmin/BaseSupplierTypeRest.java +++ /dev/null @@ -1,89 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.apiadmin; - -import com.yxt.goods.biz.base.basesuppliertype.*; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierTypeFeignFallback.java
- * Class: com.yxt.anrui.as.biz.basesuppliertype.BaseSupplierTypeRest
- * Description: 供应商类型.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Api(tags = "供应商类型") -@RestController -@RequestMapping("/apiadmin/base/basesuppliertype") -public class BaseSupplierTypeRest { - - @Autowired - private BaseSupplierTypeService baseSupplierTypeService; - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = baseSupplierTypeService.listPageVo(pq); - return rb.success().setData(pv); - } - - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody BaseSupplierTypeDto dto){ - ResultBean rb = ResultBean.fireFail(); - baseSupplierTypeService.saveOrUpdateDto(dto); - return rb.success(); - } - - @ApiOperation("根据sid批量删除") - @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - baseSupplierTypeService.delBySids(sids); - return rb.success(); - } - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - BaseSupplierTypeDetailsVo vo = baseSupplierTypeService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } -} diff --git a/src/main/java/com/yxt/goods/apiadmin/AdminHomeRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsAdminHomeRest.java similarity index 88% rename from src/main/java/com/yxt/goods/apiadmin/AdminHomeRest.java rename to src/main/java/com/yxt/goods/apiadmin/GoodsAdminHomeRest.java index 12f361d..ecdb083 100644 --- a/src/main/java/com/yxt/goods/apiadmin/AdminHomeRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsAdminHomeRest.java @@ -5,6 +5,6 @@ import org.springframework.web.bind.annotation.RestController; @RestController("com.yxt.base.apiadmin.AdminHomeRest") @RequestMapping("/apiadmin/home") -public class AdminHomeRest { +public class GoodsAdminHomeRest { } diff --git a/src/main/java/com/yxt/goods/apiadmin/BaseGoodsBrandRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsBrandRest.java similarity index 73% rename from src/main/java/com/yxt/goods/apiadmin/BaseGoodsBrandRest.java rename to src/main/java/com/yxt/goods/apiadmin/GoodsBrandRest.java index 7c476b3..ec39bc1 100644 --- a/src/main/java/com/yxt/goods/apiadmin/BaseGoodsBrandRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsBrandRest.java @@ -1,9 +1,10 @@ package com.yxt.goods.apiadmin; -import com.yxt.goods.biz.base.basebrandinfo.*; +import com.yxt.goods.biz.goodsbrandinfo.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.goods.biz.goodsbrandinfo.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -18,30 +19,30 @@ import java.util.List; @Api(tags = "商品品牌") @RestController @RequestMapping("/apiadmin/base/basegoodsbrand") -public class BaseGoodsBrandRest { +public class GoodsBrandRest { @Autowired - BaseBrandInfoService baseBrandInfoService; + GoodsBrandInfoService baseBrandInfoService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { + public ResultBean> listPage(@RequestBody PagerQuery pq) { return baseBrandInfoService.listPage(pq); } @ApiOperation("查询所有的品牌") @GetMapping("/listAll") - public ResultBean> listAll() { + public ResultBean> listAll() { return baseBrandInfoService.listAll(); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody BaseBrandInfoDto dto) { + public ResultBean saveOrUpdate(@RequestBody GoodsBrandInfoDto dto) { return baseBrandInfoService.saveOrUpdate(dto); } @ApiOperation("初始化") @GetMapping("/initialization/{sid}") - public ResultBean initialization(@PathVariable("sid") String sid) { + public ResultBean initialization(@PathVariable("sid") String sid) { return baseBrandInfoService.initialization(sid); } @@ -59,7 +60,7 @@ public class BaseGoodsBrandRest { } @ApiOperation("根据品牌名查询") @GetMapping("/getBrandByName/{name}") - public ResultBean getBrandByName(@PathVariable("name") String name) { + public ResultBean getBrandByName(@PathVariable("name") String name) { return baseBrandInfoService.getBrandByName(name); } } diff --git a/src/main/java/com/yxt/goods/apiadmin/BaseCategoryBrandRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsCategoryBrandRest.java similarity index 67% rename from src/main/java/com/yxt/goods/apiadmin/BaseCategoryBrandRest.java rename to src/main/java/com/yxt/goods/apiadmin/GoodsCategoryBrandRest.java index 2c473bc..29e5b63 100644 --- a/src/main/java/com/yxt/goods/apiadmin/BaseCategoryBrandRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsCategoryBrandRest.java @@ -1,9 +1,9 @@ package com.yxt.goods.apiadmin; -import com.yxt.goods.biz.base.basecategorybrand.BaseCategoryBrandDto; -import com.yxt.goods.biz.base.basecategorybrand.BaseCategoryBrandQuery; -import com.yxt.goods.biz.base.basecategorybrand.BaseCategoryBrandService; -import com.yxt.goods.biz.base.basecategorybrand.BaseCategoryBrandVo; +import com.yxt.goods.biz.goodscategorybrand.GoodsCategoryBrandDto; +import com.yxt.goods.biz.goodscategorybrand.GoodsCategoryBrandQuery; +import com.yxt.goods.biz.goodscategorybrand.GoodsCategoryBrandService; +import com.yxt.goods.biz.goodscategorybrand.GoodsCategoryBrandVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -19,25 +19,25 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "品牌与商品类别关联") @RestController @RequestMapping("/apiadmin/base/basecategorybrand") -public class BaseCategoryBrandRest { +public class GoodsCategoryBrandRest { @Autowired - BaseCategoryBrandService baseCategoryBrandService; + GoodsCategoryBrandService baseCategoryBrandService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { + public ResultBean> listPage(@RequestBody PagerQuery pq) { return baseCategoryBrandService.listPage(pq); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody BaseCategoryBrandDto dto) { + public ResultBean saveOrUpdate(@RequestBody GoodsCategoryBrandDto dto) { return baseCategoryBrandService.saveOrUpdate(dto); } @ApiOperation("初始化") @GetMapping("/initialization/{sid}") - public ResultBean initialization(@PathVariable("sid") String sid) { + public ResultBean initialization(@PathVariable("sid") String sid) { return baseCategoryBrandService.initialization(sid); } diff --git a/src/main/java/com/yxt/goods/apiadmin/BaseManufacturerRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsManufacturerRest.java similarity index 71% rename from src/main/java/com/yxt/goods/apiadmin/BaseManufacturerRest.java rename to src/main/java/com/yxt/goods/apiadmin/GoodsManufacturerRest.java index 0653341..1053274 100644 --- a/src/main/java/com/yxt/goods/apiadmin/BaseManufacturerRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsManufacturerRest.java @@ -1,9 +1,10 @@ package com.yxt.goods.apiadmin; -import com.yxt.goods.biz.base.basemanufacturer.*; +import com.yxt.goods.biz.goodsmanufacturer.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.goods.biz.goodsmanufacturer.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -18,32 +19,32 @@ import java.util.List; @Api(tags = "厂家信息") @RestController @RequestMapping("/apiadmin/base/basemanufacturer") -public class BaseManufacturerRest { +public class GoodsManufacturerRest { @Autowired - BaseManufacturerService baseManufacturerService; + GoodsManufacturerService baseManufacturerService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { + public ResultBean> listPage(@RequestBody PagerQuery pq) { return baseManufacturerService.listPage(pq); } @ApiOperation("查询所有的厂家") @GetMapping("/listAll") - public ResultBean> listAll() { + public ResultBean> listAll() { return baseManufacturerService.listAll(); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody BaseManufacturerDto dto) { + public ResultBean saveOrUpdate(@RequestBody GoodsManufacturerDto dto) { return baseManufacturerService.saveOrUpdate(dto); } @ApiOperation("初始化") @GetMapping("/initialization/{sid}") - public ResultBean initialization(@PathVariable("sid") String sid) { + public ResultBean initialization(@PathVariable("sid") String sid) { return baseManufacturerService.initialization(sid); } @@ -62,12 +63,12 @@ public class BaseManufacturerRest { @ApiOperation("查询分公司下所有的厂家") @GetMapping("/getAllTypeByUseOrgSid") - public ResultBean> getAllTypeByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid) { + public ResultBean> getAllTypeByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid) { return baseManufacturerService.getAllTypeByUseOrgSid(useOrgSid); } @ApiOperation("根据厂家名查询") @GetMapping("/getManufacturerByName/{name}") - public ResultBean getManufacturerByName(@PathVariable("name") String name) { + public ResultBean getManufacturerByName(@PathVariable("name") String name) { return baseManufacturerService.getManufacturerByName(name); } } diff --git a/src/main/java/com/yxt/goods/apiadmin/ShoppingCartRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsShoppingCartRest.java similarity index 66% rename from src/main/java/com/yxt/goods/apiadmin/ShoppingCartRest.java rename to src/main/java/com/yxt/goods/apiadmin/GoodsShoppingCartRest.java index c3eecfa..79f930c 100644 --- a/src/main/java/com/yxt/goods/apiadmin/ShoppingCartRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsShoppingCartRest.java @@ -2,9 +2,9 @@ package com.yxt.goods.apiadmin; import com.yxt.common.core.result.ResultBean; -import com.yxt.goods.biz.base.shoppingcart.ShoppingCartDto; -import com.yxt.goods.biz.base.shoppingcart.ShoppingCartQuery; -import com.yxt.goods.biz.base.shoppingcart.ShoppingCartService; +import com.yxt.goods.biz.goodsshoppingcart.GoodsShoppingCartDto; +import com.yxt.goods.biz.goodsshoppingcart.GoodsShoppingCartQuery; +import com.yxt.goods.biz.goodsshoppingcart.GoodsShoppingCartService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -17,29 +17,29 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "购物车") @RestController @RequestMapping("shoppingcart") -public class ShoppingCartRest { +public class GoodsShoppingCartRest { @Autowired - ShoppingCartService shoppingCartService; + GoodsShoppingCartService shoppingCartService; @ApiOperation("加入购物车") @PostMapping("/addShoppingCart") - public ResultBean save(@RequestBody ShoppingCartDto dto) { + public ResultBean save(@RequestBody GoodsShoppingCartDto dto) { return shoppingCartService.save(dto); } @ApiOperation("减购物车") @PostMapping("/minusShoppingCart") - public ResultBean minusShoppingCart(@RequestBody ShoppingCartDto dto) { + public ResultBean minusShoppingCart(@RequestBody GoodsShoppingCartDto dto) { return shoppingCartService.minusShoppingCart(dto); } @ApiOperation("修改购物车数量") @PostMapping("/updateShoppingCart") - public ResultBean updateShoppingCart(@RequestBody ShoppingCartDto dto) { + public ResultBean updateShoppingCart(@RequestBody GoodsShoppingCartDto dto) { return shoppingCartService.updateShoppingCart(dto); } @ApiOperation("购物车列表") @PostMapping("/shoppingCartList") - public ResultBean shoppingCartList(@RequestBody ShoppingCartQuery query) { + public ResultBean shoppingCartList(@RequestBody GoodsShoppingCartQuery query) { return shoppingCartService.shoppingCartList(query); } @@ -50,7 +50,7 @@ public class ShoppingCartRest { } @ApiOperation("计算购物车价格和重量") @PostMapping("/getGoodsWeight") - public ResultBean getGoodsWeight(@RequestBody ShoppingCartQuery query) { + public ResultBean getGoodsWeight(@RequestBody GoodsShoppingCartQuery query) { return shoppingCartService.getGoodsWeight(query); } } diff --git a/src/main/java/com/yxt/goods/apiadmin/GoodsSkuExtendRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsSkuExtendRest.java new file mode 100644 index 0000000..2a4fbbc --- /dev/null +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsSkuExtendRest.java @@ -0,0 +1,62 @@ +package com.yxt.goods.apiadmin; + +import com.yxt.goods.biz.goodssku.GoodsSkuDto; +import com.yxt.goods.biz.goodsskuextend.GoodsSkuExtendDto; +import com.yxt.goods.biz.goodsskuextend.GoodsSkuExtendQuery; +import com.yxt.goods.biz.goodsskuextend.GoodsSkuExtendService; +import com.yxt.goods.biz.goodsskuextend.GoodsSkuExtendVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/3/11 15:05 + */ +@Api(tags = "商品sku扩展") +@RestController +@RequestMapping("/apiadmin/base/basegoodsskuextend") +public class GoodsSkuExtendRest { + + @Autowired + GoodsSkuExtendService goodsSkuExtendService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return goodsSkuExtendService.listPage(pq); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody GoodsSkuExtendDto dto) { + return goodsSkuExtendService.saveOrUpdate(dto); + } + @ApiOperation("保存") + @PostMapping("/batchSave") + public ResultBean batchSave(@RequestBody List dtos) { + return goodsSkuExtendService.skuEBatchSave(dtos); + } + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return goodsSkuExtendService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return goodsSkuExtendService.delete(sid); + } + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) { + return goodsSkuExtendService.updateIsEnable(sid,isEnable); + } +} diff --git a/src/main/java/com/yxt/goods/apiadmin/BaseGoodsSkuRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsSkuRest.java similarity index 50% rename from src/main/java/com/yxt/goods/apiadmin/BaseGoodsSkuRest.java rename to src/main/java/com/yxt/goods/apiadmin/GoodsSkuRest.java index 6d0c0f3..fa80cf0 100644 --- a/src/main/java/com/yxt/goods/apiadmin/BaseGoodsSkuRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsSkuRest.java @@ -1,10 +1,11 @@ package com.yxt.goods.apiadmin; -import com.yxt.goods.biz.base.basegoodssku.*; +import com.yxt.goods.biz.goodssku.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpuDto; +import com.yxt.goods.biz.goodssku.*; +import com.yxt.goods.biz.goodsspu.GoodsSpuDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -19,61 +20,61 @@ import java.util.List; @Api(tags = "商品sku") @RestController @RequestMapping("/apiadmin/base/basegoodssku") -public class BaseGoodsSkuRest { +public class GoodsSkuRest { @Autowired - BaseGoodsSkuService baseGoodsSkuService; + GoodsSkuService goodsSkuService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - return baseGoodsSkuService.listPage(pq); + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return goodsSkuService.listPage(pq); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody BaseGoodsSkuDto dto) { - return baseGoodsSkuService.saveOrUpdate(dto); + public ResultBean saveOrUpdate(@RequestBody GoodsSkuDto dto) { + return goodsSkuService.saveOrUpdate(dto); } @ApiOperation("保存") @PostMapping("/batchSave") - public ResultBean batchSave(@RequestBody List dtos) { - return baseGoodsSkuService.skuBatchSave(dtos); + public ResultBean batchSave(@RequestBody List dtos) { + return goodsSkuService.skuBatchSave(dtos); } @ApiOperation("初始化") @GetMapping("/initialization/{sid}") - public ResultBean initialization(@PathVariable("sid") String sid) { - return baseGoodsSkuService.initialization(sid); + public ResultBean initialization(@PathVariable("sid") String sid) { + return goodsSkuService.initialization(sid); } @ApiOperation("删除") @DeleteMapping("/delete/{sid}") public ResultBean delete(@PathVariable("sid") String sid) { - return baseGoodsSkuService.delete(sid); + return goodsSkuService.delete(sid); } @ApiOperation("更改可用状态") @GetMapping("/updateIsEnable/{sid}/{isEnable}") public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("isEnable") String isEnable) { - return baseGoodsSkuService.updateIsEnable(sid, isEnable); + return goodsSkuService.updateIsEnable(sid, isEnable); } @ApiOperation("获取商品信息") @GetMapping("/getDetails") - ResultBean getDetails(@RequestParam("sid") String sid) { - return baseGoodsSkuService.getDetails(sid); + ResultBean getDetails(@RequestParam("sid") String sid) { + return goodsSkuService.getDetails(sid); } @ApiOperation("入库添加商品列表") @PostMapping("/getSelectList") - ResultBean> getSelectList(@RequestBody PagerQuery pagerQuery) { - ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = baseGoodsSkuService.getSelectList(pagerQuery); + ResultBean> getSelectList(@RequestBody PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = goodsSkuService.getSelectList(pagerQuery); return rb.success().setData(pv); } @ApiOperation("采购商品分页列表") @PostMapping("/purGoodsListPage") - public ResultBean> purGoodsListPage(@RequestBody PagerQuery pq) { - return baseGoodsSkuService.purGoodsListPage(pq); + public ResultBean> purGoodsListPage(@RequestBody PagerQuery pq) { + return goodsSkuService.purGoodsListPage(pq); } } diff --git a/src/main/java/com/yxt/goods/apiadmin/BaseSpecGroupRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsSpecGroupRest.java similarity index 55% rename from src/main/java/com/yxt/goods/apiadmin/BaseSpecGroupRest.java rename to src/main/java/com/yxt/goods/apiadmin/GoodsSpecGroupRest.java index fa99a35..96f8d81 100644 --- a/src/main/java/com/yxt/goods/apiadmin/BaseSpecGroupRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsSpecGroupRest.java @@ -1,10 +1,10 @@ package com.yxt.goods.apiadmin; -import com.yxt.goods.biz.base.basespecparam.BaseSpecParamDto; -import com.yxt.goods.biz.base.basespecparam.BaseSpecParamQuery; -import com.yxt.goods.biz.base.basespecparam.BaseSpecParamService; -import com.yxt.goods.biz.base.basespecparam.BaseSpecParamVo; +import com.yxt.goods.biz.goodsspecparam.GoodsSpecParamDto; +import com.yxt.goods.biz.goodsspecparam.GoodsSpecParamQuery; +import com.yxt.goods.biz.goodsspecparam.GoodsSpecParamService; +import com.yxt.goods.biz.goodsspecparam.GoodsSpecParamVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -20,38 +20,38 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "规格参数组表") @RestController @RequestMapping("/apiadmin/base/basespecgroup") -public class BaseSpecGroupRest { +public class GoodsSpecGroupRest { @Autowired - BaseSpecParamService baseSpecParamService; + GoodsSpecParamService goodsSpecParamService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - return baseSpecParamService.listPage(pq); + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return goodsSpecParamService.listPage(pq); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody BaseSpecParamDto dto) { - return baseSpecParamService.saveOrUpdate(dto); + public ResultBean saveOrUpdate(@RequestBody GoodsSpecParamDto dto) { + return goodsSpecParamService.saveOrUpdate(dto); } @ApiOperation("初始化") @GetMapping("/initialization/{sid}") - public ResultBean initialization(@PathVariable("sid") String sid) { - return baseSpecParamService.initialization(sid); + public ResultBean initialization(@PathVariable("sid") String sid) { + return goodsSpecParamService.initialization(sid); } @ApiOperation("删除") @DeleteMapping("/delete/{sid}") public ResultBean delete(@PathVariable("sid") String sid) { - return baseSpecParamService.delete(sid); + return goodsSpecParamService.delete(sid); } @ApiOperation("更改可用状态") @GetMapping("/updateIsEnable/{sid}/{isEnable}") public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("isEnable") String isEnable) { - return baseSpecParamService.updateIsEnable(sid, isEnable); + return goodsSpecParamService.updateIsEnable(sid, isEnable); } } diff --git a/src/main/java/com/yxt/goods/apiadmin/BaseSpecParamRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsSpecParamRest.java similarity index 55% rename from src/main/java/com/yxt/goods/apiadmin/BaseSpecParamRest.java rename to src/main/java/com/yxt/goods/apiadmin/GoodsSpecParamRest.java index 5807765..6ea996b 100644 --- a/src/main/java/com/yxt/goods/apiadmin/BaseSpecParamRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsSpecParamRest.java @@ -1,10 +1,10 @@ package com.yxt.goods.apiadmin; -import com.yxt.goods.biz.base.basespecparam.BaseSpecParamDto; -import com.yxt.goods.biz.base.basespecparam.BaseSpecParamQuery; -import com.yxt.goods.biz.base.basespecparam.BaseSpecParamService; -import com.yxt.goods.biz.base.basespecparam.BaseSpecParamVo; +import com.yxt.goods.biz.goodsspecparam.GoodsSpecParamDto; +import com.yxt.goods.biz.goodsspecparam.GoodsSpecParamQuery; +import com.yxt.goods.biz.goodsspecparam.GoodsSpecParamService; +import com.yxt.goods.biz.goodsspecparam.GoodsSpecParamVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -20,38 +20,38 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "规格参数定义表") @RestController @RequestMapping("/apiadmin/base/basespecparam") -public class BaseSpecParamRest { +public class GoodsSpecParamRest { @Autowired - BaseSpecParamService baseSpecParamService; + GoodsSpecParamService goodsSpecParamService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - return baseSpecParamService.listPage(pq); + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return goodsSpecParamService.listPage(pq); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody BaseSpecParamDto dto) { - return baseSpecParamService.saveOrUpdate(dto); + public ResultBean saveOrUpdate(@RequestBody GoodsSpecParamDto dto) { + return goodsSpecParamService.saveOrUpdate(dto); } @ApiOperation("初始化") @GetMapping("/initialization/{sid}") - public ResultBean initialization(@PathVariable("sid") String sid) { - return baseSpecParamService.initialization(sid); + public ResultBean initialization(@PathVariable("sid") String sid) { + return goodsSpecParamService.initialization(sid); } @ApiOperation("删除") @DeleteMapping("/delete/{sid}") public ResultBean delete(@PathVariable("sid") String sid) { - return baseSpecParamService.delete(sid); + return goodsSpecParamService.delete(sid); } @ApiOperation("更改可用状态") @GetMapping("/updateIsEnable/{sid}/{isEnable}") public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("isEnable") String isEnable) { - return baseSpecParamService.updateIsEnable(sid, isEnable); + return goodsSpecParamService.updateIsEnable(sid, isEnable); } } diff --git a/src/main/java/com/yxt/goods/apiadmin/BaseGoodsSpuDetailRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsSpuDetailRest.java similarity index 73% rename from src/main/java/com/yxt/goods/apiadmin/BaseGoodsSpuDetailRest.java rename to src/main/java/com/yxt/goods/apiadmin/GoodsSpuDetailRest.java index a6cab6a..2730b2a 100644 --- a/src/main/java/com/yxt/goods/apiadmin/BaseGoodsSpuDetailRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsSpuDetailRest.java @@ -1,10 +1,10 @@ package com.yxt.goods.apiadmin; -import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpuDto; -import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetailDto; -import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetailQuery; -import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetailService; -import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetailVo; +import com.yxt.goods.biz.goodsspu.GoodsSpuDto; +import com.yxt.goods.biz.goodsspudetail.GoodsSpuDetailDto; +import com.yxt.goods.biz.goodsspudetail.BaseGoodsSpuDetailQuery; +import com.yxt.goods.biz.goodsspudetail.BaseGoodsSpuDetailService; +import com.yxt.goods.biz.goodsspudetail.BaseGoodsSpuDetailVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -23,7 +23,7 @@ import java.util.List; @Api(tags = "商品spu详情") @RestController @RequestMapping("/apiadmin/base/basegoodsspudetail") -public class BaseGoodsSpuDetailRest { +public class GoodsSpuDetailRest { @Autowired BaseGoodsSpuDetailService baseGoodsSpuDetailService; @@ -36,12 +36,12 @@ public class BaseGoodsSpuDetailRest { @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody BaseGoodsSpuDetailDto dto) { + public ResultBean saveOrUpdate(@RequestBody GoodsSpuDetailDto dto) { return baseGoodsSpuDetailService.saveOrUpdate(dto); } @ApiOperation("保存") @PostMapping("/batchSave") - public ResultBean batchSave(@RequestBody List dtos) { + public ResultBean batchSave(@RequestBody List dtos) { return baseGoodsSpuDetailService.batchSave(dtos); } @ApiOperation("初始化") diff --git a/src/main/java/com/yxt/goods/apiadmin/BaseGoodsSpuRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsSpuRest.java similarity index 62% rename from src/main/java/com/yxt/goods/apiadmin/BaseGoodsSpuRest.java rename to src/main/java/com/yxt/goods/apiadmin/GoodsSpuRest.java index 4c28483..8e95989 100644 --- a/src/main/java/com/yxt/goods/apiadmin/BaseGoodsSpuRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsSpuRest.java @@ -1,9 +1,9 @@ package com.yxt.goods.apiadmin; -import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpuDto; -import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpuQuery; -import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpuService; -import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpuVo; +import com.yxt.goods.biz.goodsspu.GoodsSpuDto; +import com.yxt.goods.biz.goodsspu.GoodsSpuQuery; +import com.yxt.goods.biz.goodsspu.GoodsSpuService; +import com.yxt.goods.biz.goodsspu.GoodsSpuVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -24,25 +24,25 @@ import java.util.List; @Api(tags = "商品spu") @RestController @RequestMapping("/apiadmin/base/basegoodsspu") -public class BaseGoodsSpuRest { +public class GoodsSpuRest { @Autowired - BaseGoodsSpuService baseGoodsSpuService; + GoodsSpuService goodsSpuService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - return baseGoodsSpuService.listPage(pq); + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return goodsSpuService.listPage(pq); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody BaseGoodsSpuDto dto) { - return baseGoodsSpuService.saveOrUpdate(dto); + public ResultBean saveOrUpdate(@RequestBody GoodsSpuDto dto) { + return goodsSpuService.saveOrUpdate(dto); } @ApiOperation("保存") @PostMapping("/batchSave") - public ResultBean batchSave(@RequestBody List dtos) { - return baseGoodsSpuService.batchSave(dtos); + public ResultBean batchSave(@RequestBody List dtos) { + return goodsSpuService.batchSave(dtos); } // @ApiOperation("保存商品信息及sku") // @PostMapping("/save") @@ -51,23 +51,23 @@ public class BaseGoodsSpuRest { // } @ApiOperation("初始化") @GetMapping("/initialization/{sid}") - public ResultBean initialization(@PathVariable("sid") String sid) { - return baseGoodsSpuService.initialization(sid); + public ResultBean initialization(@PathVariable("sid") String sid) { + return goodsSpuService.initialization(sid); } @ApiOperation("删除") @DeleteMapping("/delete/{sid}") public ResultBean delete(@PathVariable("sid") String sid) { - return baseGoodsSpuService.delete(sid); + return goodsSpuService.delete(sid); } @ApiOperation("更改可用状态") @GetMapping("/updateIsEnable/{sid}/{isEnable}") public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) { - return baseGoodsSpuService.updateIsEnable(sid,isEnable); + return goodsSpuService.updateIsEnable(sid,isEnable); } @ApiOperation("导入excel") @PostMapping(value ="/importExcel" ,consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public ResultBean importExcel(@RequestParam("file") MultipartFile file) throws IOException { - return baseGoodsSpuService.importExcel(file); + return goodsSpuService.importExcel(file); } } diff --git a/src/main/java/com/yxt/goods/apiadmin/BaseGoodsTypeRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsTypeRest.java similarity index 58% rename from src/main/java/com/yxt/goods/apiadmin/BaseGoodsTypeRest.java rename to src/main/java/com/yxt/goods/apiadmin/GoodsTypeRest.java index d0d10d2..9dce892 100644 --- a/src/main/java/com/yxt/goods/apiadmin/BaseGoodsTypeRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsTypeRest.java @@ -1,9 +1,10 @@ package com.yxt.goods.apiadmin; -import com.yxt.goods.biz.base.basegoodstype.*; +import com.yxt.goods.biz.goodstype.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.goods.biz.goodstype.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -18,49 +19,49 @@ import java.util.List; @Api(tags = "商品类型") @RestController @RequestMapping("/apiadmin/base/basegoodstype") -public class BaseGoodsTypeRest { +public class GoodsTypeRest { @Autowired - BaseGoodsTypeService baseGoodsTypeService; + GoodsTypeService goodsTypeService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - return baseGoodsTypeService.listPage(pq); + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return goodsTypeService.listPage(pq); } @ApiOperation("查询所有的类别") @GetMapping("/listAll") - public ResultBean> listAll() { - return baseGoodsTypeService.listAll(); + public ResultBean> listAll() { + return goodsTypeService.listAll(); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody BaseGoodsTypeDto dto) { - return baseGoodsTypeService.saveOrUpdate(dto); + public ResultBean saveOrUpdate(@RequestBody GoodsTypeDto dto) { + return goodsTypeService.saveOrUpdate(dto); } @ApiOperation("初始化") @GetMapping("/initialization/{sid}") - public ResultBean initialization(@PathVariable("sid") String sid) { - return baseGoodsTypeService.initialization(sid); + public ResultBean initialization(@PathVariable("sid") String sid) { + return goodsTypeService.initialization(sid); } @ApiOperation("删除") @DeleteMapping("/delete/{sid}") public ResultBean delete(@PathVariable("sid") String sid) { - return baseGoodsTypeService.delete(sid); + return goodsTypeService.delete(sid); } @ApiOperation("更改可用状态") @GetMapping("/updateIsEnable/{sid}/{isEnable}") public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) { - return baseGoodsTypeService.updateIsEnable(sid,isEnable); + return goodsTypeService.updateIsEnable(sid,isEnable); } @ApiOperation("根据类型名查询") @GetMapping("/getTypeByName/{name}") - public ResultBean getTypeByName(@PathVariable("name") String name) { - return baseGoodsTypeService.getTypeByName(name); + public ResultBean getTypeByName(@PathVariable("name") String name) { + return goodsTypeService.getTypeByName(name); } } diff --git a/src/main/java/com/yxt/goods/apiadmin/BaseGoodsUnitRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsUnitRest.java similarity index 58% rename from src/main/java/com/yxt/goods/apiadmin/BaseGoodsUnitRest.java rename to src/main/java/com/yxt/goods/apiadmin/GoodsUnitRest.java index 86e3e15..80ab434 100644 --- a/src/main/java/com/yxt/goods/apiadmin/BaseGoodsUnitRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsUnitRest.java @@ -1,9 +1,10 @@ package com.yxt.goods.apiadmin; -import com.yxt.goods.biz.base.basegoodsunit.*; +import com.yxt.goods.biz.goodsunit.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.goods.biz.goodsunit.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -18,49 +19,49 @@ import java.util.List; @Api(tags = "商品类型") @RestController @RequestMapping("/apiadmin/base/basegoodsunit") -public class BaseGoodsUnitRest { +public class GoodsUnitRest { @Autowired - BaseGoodsUnitService baseGoodsUnitService; + GoodsUnitService goodsUnitService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - return baseGoodsUnitService.listPage(pq); + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return goodsUnitService.listPage(pq); } @ApiOperation("查询所有的类别") @GetMapping("/listAll") - public ResultBean> listAll() { - return baseGoodsUnitService.listAll(); + public ResultBean> listAll() { + return goodsUnitService.listAll(); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody BaseGoodsUnitDto dto) { - return baseGoodsUnitService.saveOrUpdate(dto); + public ResultBean saveOrUpdate(@RequestBody GoodsUnitDto dto) { + return goodsUnitService.saveOrUpdate(dto); } @ApiOperation("初始化") @GetMapping("/initialization/{sid}") - public ResultBean initialization(@PathVariable("sid") String sid) { - return baseGoodsUnitService.initialization(sid); + public ResultBean initialization(@PathVariable("sid") String sid) { + return goodsUnitService.initialization(sid); } @ApiOperation("删除") @DeleteMapping("/delete/{sid}") public ResultBean delete(@PathVariable("sid") String sid) { - return baseGoodsUnitService.delete(sid); + return goodsUnitService.delete(sid); } @ApiOperation("更改可用状态") @GetMapping("/updateIsEnable/{sid}/{isEnable}") public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) { - return baseGoodsUnitService.updateIsEnable(sid,isEnable); + return goodsUnitService.updateIsEnable(sid,isEnable); } @ApiOperation("根据单位名查询") @GetMapping("/getUnitByName/{name}") - public ResultBean getUnitByName(@PathVariable("name") String name) { - return baseGoodsUnitService.getUnitByName(name); + public ResultBean getUnitByName(@PathVariable("name") String name) { + return goodsUnitService.getUnitByName(name); } } diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuMapper.java b/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuMapper.java deleted file mode 100644 index 8f6e02b..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.yxt.goods.biz.base.basegoodssku; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Mapper -public interface BaseGoodsSkuMapper extends BaseMapper { - - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List getSkusBySpuSid(@Param("spuSid")String spuSid); - BaseGoodsSkuVo getSkuBySid(@Param("sid")String sid); - - IPage getSelectList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); - - IPage purGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); -} diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtendMapper.java b/src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtendMapper.java deleted file mode 100644 index 9db05ab..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtendMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsskuextend; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Mapper -public interface BaseGoodsSkuExtendMapper extends BaseMapper { - - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - BaseGoodsSkuExtendVo getExtendBySkuSid(@Param("skuSid")String skuSid); - BaseGoodsSkuExtendVo getExtendBySid(@Param("sid")String sid); -} diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtendQuery.java b/src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtendQuery.java deleted file mode 100644 index 435f217..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtendQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsskuextend; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseGoodsSkuExtendQuery implements Query { - private String name; -} diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitQuery.java b/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitQuery.java deleted file mode 100644 index 8db9151..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yxt.goods.biz.base.basegoodsunit; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseGoodsUnitQuery implements Query { - private String name; -} diff --git a/src/main/java/com/yxt/goods/biz/base/basemanufacturer/BaseManufacturerQuery.java b/src/main/java/com/yxt/goods/biz/base/basemanufacturer/BaseManufacturerQuery.java deleted file mode 100644 index 91a686d..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basemanufacturer/BaseManufacturerQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yxt.goods.biz.base.basemanufacturer; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class BaseManufacturerQuery implements Query { - private String name; -} diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBank.java b/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBank.java deleted file mode 100644 index 041d855..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBank.java +++ /dev/null @@ -1,76 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierBank; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierBank.java
- * Class: com.yxt.base.api.basesupplierbank.BaseSupplierBank
- * Description: 供应商开户行信息.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商开户行信息", description = "供应商开户行信息") -@TableName("base_supplier_bank") -public class BaseSupplierBank extends BaseEntity { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("供应商sid") - private String supplierSid; // 供应商sid - @ApiModelProperty("开户行") - private String bankName; // 开户行 - @ApiModelProperty("开户行帐号") - private String bankAccount; // 开户行帐号 - @ApiModelProperty("账户名称") - private String accountName; // 账户名称 - @ApiModelProperty("账户类型key") - private String dueBankKey; // 账户类型key - @ApiModelProperty("账户类型value") - private String dueBankValue; // 账户类型value - @ApiModelProperty("银行网点") - private String bankingOutlets; // 银行网点 - @ApiModelProperty("开户行地址") - private String bankAddress; // 开户行地址 - @ApiModelProperty("联行号") - private String paymentLines; // 联行号 - @ApiModelProperty("银行代码") - private String swiftCode; // 银行代码 - @ApiModelProperty("币种") - private String currency; // 币种 - -} diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankDetailsVo.java b/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankDetailsVo.java deleted file mode 100644 index 3141dad..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankDetailsVo.java +++ /dev/null @@ -1,76 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierBank; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierBankVo.java
- * Class: com.yxt.base.api.basesupplierbank.BaseSupplierBankVo
- * Description: 供应商开户行信息 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商开户行信息 视图数据详情", description = "供应商开户行信息 视图数据详情") -public class BaseSupplierBankDetailsVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("供应商sid") - private String supplierSid; // 供应商sid - @ApiModelProperty("开户行") - private String bankName; // 开户行 - @ApiModelProperty("开户行帐号") - private String bankAccount; // 开户行帐号 - @ApiModelProperty("账户名称") - private String accountName; // 账户名称 - @ApiModelProperty("账户类型key") - private String dueBankKey; // 账户类型key - @ApiModelProperty("账户类型value") - private String dueBankValue; // 账户类型value - @ApiModelProperty("银行网点") - private String bankingOutlets; // 银行网点 - @ApiModelProperty("开户行地址") - private String bankAddress; // 开户行地址 - @ApiModelProperty("联行号") - private String paymentLines; // 联行号 - @ApiModelProperty("银行代码") - private String swiftCode; // 银行代码 - @ApiModelProperty("币种") - private String currency; // 币种 - -} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankDto.java b/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankDto.java deleted file mode 100644 index eb321cc..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankDto.java +++ /dev/null @@ -1,76 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierBank; - - -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierBankDto.java
- * Class: com.yxt.base.api.basesupplierbank.BaseSupplierBankDto
- * Description: 供应商开户行信息 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商开户行信息 数据传输对象", description = "供应商开户行信息 数据传输对象") -public class BaseSupplierBankDto implements Dto { - - private String sid; // sid - - @ApiModelProperty("供应商sid") - private String supplierSid; // 供应商sid - @ApiModelProperty("开户行") - private String bankName; // 开户行 - @ApiModelProperty("开户行帐号") - private String bankAccount; // 开户行帐号 - @ApiModelProperty("账户名称") - private String accountName; // 账户名称 - @ApiModelProperty("账户类型key") - private String dueBankKey; // 账户类型key - @ApiModelProperty("账户类型value") - private String dueBankValue; // 账户类型value - @ApiModelProperty("银行网点") - private String bankingOutlets; // 银行网点 - @ApiModelProperty("开户行地址") - private String bankAddress; // 开户行地址 - @ApiModelProperty("联行号") - private String paymentLines; // 联行号 - @ApiModelProperty("银行代码") - private String swiftCode; // 银行代码 - @ApiModelProperty("币种") - private String currency; // 币种 - -} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankMapper.java b/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankMapper.java deleted file mode 100644 index 92dd389..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankMapper.java +++ /dev/null @@ -1,67 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierBank; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Delete; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierBankMapper.java
- * Class: com.yxt.base.biz.basesupplierbank.BaseSupplierBankMapper
- * Description: 供应商开户行信息.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Mapper -public interface BaseSupplierBankMapper extends BaseMapper { - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from base_supplier_bank") - List selectListVo(); - - @Delete("delete from base_supplier_bank where supplierSid = #{supplierSid}") - int deleteBySupplierSid(String supplierSid); - - @Select("select * from base_supplier_bank where supplierSid = #{supplierSid}") - List selectBySupplierSid(String supplierSid); -} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankMapper.xml b/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankMapper.xml deleted file mode 100644 index cf4cbab..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankQuery.java b/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankQuery.java deleted file mode 100644 index 49ab190..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankQuery.java +++ /dev/null @@ -1,74 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierBank; - - -import com.yxt.common.core.query.Query; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierBankQuery.java
- * Class: com.yxt.base.api.basesupplierbank.BaseSupplierBankQuery
- * Description: 供应商开户行信息 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商开户行信息 查询条件", description = "供应商开户行信息 查询条件") -public class BaseSupplierBankQuery implements Query { - - @ApiModelProperty("供应商sid") - private String supplierSid; // 供应商sid - @ApiModelProperty("开户行") - private String bankName; // 开户行 - @ApiModelProperty("开户行帐号") - private String bankAccount; // 开户行帐号 - @ApiModelProperty("账户名称") - private String accountName; // 账户名称 - @ApiModelProperty("账户类型key") - private String dueBankKey; // 账户类型key - @ApiModelProperty("账户类型value") - private String dueBankValue; // 账户类型value - @ApiModelProperty("银行网点") - private String bankingOutlets; // 银行网点 - @ApiModelProperty("开户行地址") - private String bankAddress; // 开户行地址 - @ApiModelProperty("联行号") - private String paymentLines; // 联行号 - @ApiModelProperty("银行代码") - private String swiftCode; // 银行代码 - @ApiModelProperty("币种") - private String currency; // 币种 - -} diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankService.java b/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankService.java deleted file mode 100644 index b94c87a..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankService.java +++ /dev/null @@ -1,104 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierBank; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.vo.PagerVo; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierBankService.java
- * Class: com.yxt.base.biz.basesupplierbank.BaseSupplierBankService
- * Description: 供应商开户行信息 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Service -public class BaseSupplierBankService extends MybatisBaseService { - - public PagerVo listPageVo(PagerQuery pq) { - BaseSupplierBankQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(BaseSupplierBankDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(BaseSupplierBankDto dto){ - BaseSupplierBank entity = new BaseSupplierBank(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(BaseSupplierBankDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - return; - } - BaseSupplierBank entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public BaseSupplierBankDetailsVo fetchDetailsVoBySid(String sid){ - BaseSupplierBank entity = fetchBySid(sid); - BaseSupplierBankDetailsVo vo = new BaseSupplierBankDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } - - public int deleteBySupplierSid(String supplierSid) { - return baseMapper.deleteBySupplierSid(supplierSid); - } - - public List selectBySupplierSid(String supplierSid) { - return baseMapper.selectBySupplierSid(supplierSid); - } -} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankVo.java b/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankVo.java deleted file mode 100644 index c7f4a6b..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierBank/BaseSupplierBankVo.java +++ /dev/null @@ -1,76 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierBank; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierBankVo.java
- * Class: com.yxt.base.api.basesupplierbank.BaseSupplierBankVo
- * Description: 供应商开户行信息 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商开户行信息 视图数据对象", description = "供应商开户行信息 视图数据对象") -public class BaseSupplierBankVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("供应商sid") - private String supplierSid; // 供应商sid - @ApiModelProperty("开户行") - private String bankName; // 开户行 - @ApiModelProperty("开户行帐号") - private String bankAccount; // 开户行帐号 - @ApiModelProperty("账户名称") - private String accountName; // 账户名称 - @ApiModelProperty("账户类型key") - private String dueBankKey; // 账户类型key - @ApiModelProperty("账户类型value") - private String dueBankValue; // 账户类型value - @ApiModelProperty("银行网点") - private String bankingOutlets; // 银行网点 - @ApiModelProperty("开户行地址") - private String bankAddress; // 开户行地址 - @ApiModelProperty("联行号") - private String paymentLines; // 联行号 - @ApiModelProperty("银行代码") - private String swiftCode; // 银行代码 - @ApiModelProperty("币种") - private String currency; // 币种 - -} diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFile.java b/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFile.java deleted file mode 100644 index 2de0646..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFile.java +++ /dev/null @@ -1,66 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierfile; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierFile.java
- * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFile
- * Description: 供应商附件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商附件", description = "供应商附件") -@TableName("base_supplier_file") -public class BaseSupplierFile extends BaseEntity { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("文件名") - private String fileName; // 文件名 - @ApiModelProperty("文件类型") - private String fileType; // 文件类型 - @ApiModelProperty("关联业务对象sid") - private String linkSid; // 关联业务对象sid - @ApiModelProperty("附件类型") - private String attachType; // 附件类型 - @ApiModelProperty("文件大小") - private String fileSize; // 文件大小 - @ApiModelProperty("文件的路径") - private String filePath; // 文件的路径 - -} diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileDetailsVo.java b/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileDetailsVo.java deleted file mode 100644 index 06b33ab..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileDetailsVo.java +++ /dev/null @@ -1,66 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierfile; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierFileVo.java
- * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileVo
- * Description: 供应商附件 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商附件 视图数据详情", description = "供应商附件 视图数据详情") -public class BaseSupplierFileDetailsVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("文件名") - private String fileName; // 文件名 - @ApiModelProperty("文件类型") - private String fileType; // 文件类型 - @ApiModelProperty("关联业务对象sid") - private String linkSid; // 关联业务对象sid - @ApiModelProperty("附件类型") - private String attachType; // 附件类型 - @ApiModelProperty("文件大小") - private String fileSize; // 文件大小 - @ApiModelProperty("文件的路径") - private String filePath; // 文件的路径 - -} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileDto.java b/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileDto.java deleted file mode 100644 index 0e4926c..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileDto.java +++ /dev/null @@ -1,66 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierfile; - - -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierFileDto.java
- * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileDto
- * Description: 供应商附件 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商附件 数据传输对象", description = "供应商附件 数据传输对象") -public class BaseSupplierFileDto implements Dto { - - private String sid; // sid - - @ApiModelProperty("文件名") - private String fileName; // 文件名 - @ApiModelProperty("文件类型") - private String fileType; // 文件类型 - @ApiModelProperty("关联业务对象sid") - private String linkSid; // 关联业务对象sid - @ApiModelProperty("附件类型") - private String attachType; // 附件类型 - @ApiModelProperty("文件大小") - private String fileSize; // 文件大小 - @ApiModelProperty("文件的路径") - private String filePath; // 文件的路径 - -} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileMapper.java b/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileMapper.java deleted file mode 100644 index d707216..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileMapper.java +++ /dev/null @@ -1,60 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierfile; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierFileMapper.java
- * Class: com.yxt.anrui.as.biz.basesupplierfile.BaseSupplierFileMapper
- * Description: 供应商附件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Mapper -public interface BaseSupplierFileMapper extends BaseMapper { - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from base_supplier_file") - List selectListVo(); -} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileMapper.xml b/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileMapper.xml deleted file mode 100644 index 832de50..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileQuery.java b/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileQuery.java deleted file mode 100644 index b53b30e..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileQuery.java +++ /dev/null @@ -1,64 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierfile; - - -import com.yxt.common.core.query.Query; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierFileQuery.java
- * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileQuery
- * Description: 供应商附件 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商附件 查询条件", description = "供应商附件 查询条件") -public class BaseSupplierFileQuery implements Query { - - @ApiModelProperty("文件名") - private String fileName; // 文件名 - @ApiModelProperty("文件类型") - private String fileType; // 文件类型 - @ApiModelProperty("关联业务对象sid") - private String linkSid; // 关联业务对象sid - @ApiModelProperty("附件类型") - private String attachType; // 附件类型 - @ApiModelProperty("文件大小") - private String fileSize; // 文件大小 - @ApiModelProperty("文件的路径") - private String filePath; // 文件的路径 - -} diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileService.java b/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileService.java deleted file mode 100644 index 9dd7826..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileService.java +++ /dev/null @@ -1,94 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierfile; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.vo.PagerVo; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierFileService.java
- * Class: com.yxt.anrui.as.biz.basesupplierfile.BaseSupplierFileService
- * Description: 供应商附件 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Service -public class BaseSupplierFileService extends MybatisBaseService { - - public PagerVo listPageVo(PagerQuery pq) { - BaseSupplierFileQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(BaseSupplierFileDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(BaseSupplierFileDto dto){ - BaseSupplierFile entity = new BaseSupplierFile(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(BaseSupplierFileDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - return; - } - BaseSupplierFile entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public BaseSupplierFileDetailsVo fetchDetailsVoBySid(String sid){ - BaseSupplierFile entity = fetchBySid(sid); - BaseSupplierFileDetailsVo vo = new BaseSupplierFileDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } -} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileVo.java b/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileVo.java deleted file mode 100644 index f65497a..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierfile/BaseSupplierFileVo.java +++ /dev/null @@ -1,66 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierfile; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierFileVo.java
- * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileVo
- * Description: 供应商附件 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商附件 视图数据对象", description = "供应商附件 视图数据对象") -public class BaseSupplierFileVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("文件名") - private String fileName; // 文件名 - @ApiModelProperty("文件类型") - private String fileType; // 文件类型 - @ApiModelProperty("关联业务对象sid") - private String linkSid; // 关联业务对象sid - @ApiModelProperty("附件类型") - private String attachType; // 附件类型 - @ApiModelProperty("文件大小") - private String fileSize; // 文件大小 - @ApiModelProperty("文件的路径") - private String filePath; // 文件的路径 - -} diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfo.java b/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfo.java deleted file mode 100644 index 4710296..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfo.java +++ /dev/null @@ -1,112 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierinfo; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfo.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfo
- * Description: 供应商信息.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商信息", description = "供应商信息") -@TableName("base_supplier_info") -public class BaseSupplierInfo extends BaseEntity { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("编码") - private String supplierCode; // 编码 - @ApiModelProperty("供应商名称") - private String supplierName; // 供应商名称 - @ApiModelProperty("供应商名称拼音") - private String supplierPY; // 供应商名称拼音 - @ApiModelProperty("供应商类型sid") - private String supplierTypeSid; // 供应商类型sid - @ApiModelProperty("供应商类型") - private String supplierTypeName; // 供应商类型 - @ApiModelProperty("省sid") - private String provinceSid; // 省sid - @ApiModelProperty("province") - private String province; // - @ApiModelProperty("市sid") - private String citySid; // 市sid - @ApiModelProperty("city") - private String city; // - @ApiModelProperty("收货县区sid") - private String countySid; // 收货县区sid - @ApiModelProperty("county") - private String county; // - @ApiModelProperty("详细地址") - private String address; // 详细地址 - @ApiModelProperty("手机") - private String contactMobile; // 手机 - @ApiModelProperty("电话") - private String contactTelePhone; // 电话 - @ApiModelProperty("联系人") - private String contactName; // 联系人 - @ApiModelProperty("传真") - private String fax; // 传真 - @ApiModelProperty("邮编") - private String zipCode; // 邮编 - @ApiModelProperty("电子邮件") - private String email; // 电子邮件 - @ApiModelProperty("网址") - private String website; // 网址 - @ApiModelProperty("开票公司名称") - private String billingCompanyName; // 开票公司名称 - @ApiModelProperty("税号") - private String registNum; // 税号 - @ApiModelProperty("法人") - private String legalName; // 法人 - @ApiModelProperty("采购员") - private String purchaser; // 采购员 - @ApiModelProperty("排序") - private Integer sortNo; // 排序 - @ApiModelProperty("开票类型key") - private String billingTypeKey; // 开票类型key - @ApiModelProperty("开票类型value") - private String billingTypeValue; // 开票类型value - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - -} diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoChoice.java b/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoChoice.java deleted file mode 100644 index eab7096..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoChoice.java +++ /dev/null @@ -1,54 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierinfo; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfoVo.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo
- * Description: 供应商信息 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商信息 视图数据对象", description = "供应商信息 视图数据对象") -public class BaseSupplierInfoChoice implements Vo { - - private String sid; - @ApiModelProperty("供应商名称") - private String supplierName; -} diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoDetailsVo.java b/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoDetailsVo.java deleted file mode 100644 index 006ecaf..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoDetailsVo.java +++ /dev/null @@ -1,116 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierinfo; - - -import com.yxt.goods.biz.base.basesupplierBank.BaseSupplierBankDetailsVo; -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfoVo.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo
- * Description: 供应商信息 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商信息 视图数据详情", description = "供应商信息 视图数据详情") -public class BaseSupplierInfoDetailsVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("编码") - private String supplierCode; // 编码 - @ApiModelProperty("供应商名称") - private String supplierName; // 供应商名称 - @ApiModelProperty("供应商名称拼音") - private String supplierPY; // 供应商名称拼音 - @ApiModelProperty("供应商类型sid") - private String supplierTypeSid; // 供应商类型sid - @ApiModelProperty("供应商类型") - private String supplierTypeName; // 供应商类型 - @ApiModelProperty("省sid") - private String provinceSid; // 省sid - @ApiModelProperty("province") - private String province; // - @ApiModelProperty("市sid") - private String citySid; // 市sid - @ApiModelProperty("city") - private String city; // - @ApiModelProperty("收货县区sid") - private String countySid; // 收货县区sid - @ApiModelProperty("county") - private String county; // - @ApiModelProperty("详细地址") - private String address; // 详细地址 - @ApiModelProperty("手机") - private String contactMobile; // 手机 - @ApiModelProperty("电话") - private String contactTelePhone; // 电话 - @ApiModelProperty("联系人") - private String contactName; // 联系人 - @ApiModelProperty("传真") - private String fax; // 传真 - @ApiModelProperty("邮编") - private String zipCode; // 邮编 - @ApiModelProperty("电子邮件") - private String email; // 电子邮件 - @ApiModelProperty("网址") - private String website; // 网址 - @ApiModelProperty("开票公司名称") - private String billingCompanyName; // 开票公司名称 - @ApiModelProperty("税号") - private String registNum; // 税号 - @ApiModelProperty("法人") - private String legalName; // 法人 - @ApiModelProperty("采购员") - private String purchaser; // 采购员 - @ApiModelProperty("排序") - private Integer sortNo; // 排序 - @ApiModelProperty("开票类型key") - private String billingTypeKey; // 开票类型key - @ApiModelProperty("开票类型value") - private String billingTypeValue; // 开票类型value - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - @ApiModelProperty("供应商开户行") - private List baseSupplierBankList; -} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoDto.java b/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoDto.java deleted file mode 100644 index c103986..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoDto.java +++ /dev/null @@ -1,116 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierinfo; - - -import com.yxt.goods.biz.base.basesupplierBank.BaseSupplierBankDto; -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfoDto.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoDto
- * Description: 供应商信息 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商信息 数据传输对象", description = "供应商信息 数据传输对象") -public class BaseSupplierInfoDto implements Dto { - - private String sid; // sid - - @ApiModelProperty("编码") - private String supplierCode; // 编码 - @ApiModelProperty("供应商名称") - private String supplierName; // 供应商名称 - @ApiModelProperty("供应商名称拼音") - private String supplierPY; // 供应商名称拼音 - @ApiModelProperty("供应商类型sid") - private String supplierTypeSid; // 供应商类型sid - @ApiModelProperty("供应商类型") - private String supplierTypeName; // 供应商类型 - @ApiModelProperty("省sid") - private String provinceSid; // 省sid - @ApiModelProperty("province") - private String province; // - @ApiModelProperty("市sid") - private String citySid; // 市sid - @ApiModelProperty("city") - private String city; // - @ApiModelProperty("收货县区sid") - private String countySid; // 收货县区sid - @ApiModelProperty("county") - private String county; // - @ApiModelProperty("详细地址") - private String address; // 详细地址 - @ApiModelProperty("手机") - private String contactMobile; // 手机 - @ApiModelProperty("电话") - private String contactTelePhone; // 电话 - @ApiModelProperty("联系人") - private String contactName; // 联系人 - @ApiModelProperty("传真") - private String fax; // 传真 - @ApiModelProperty("邮编") - private String zipCode; // 邮编 - @ApiModelProperty("电子邮件") - private String email; // 电子邮件 - @ApiModelProperty("网址") - private String website; // 网址 - @ApiModelProperty("开票公司名称") - private String billingCompanyName; // 开票公司名称 - @ApiModelProperty("税号") - private String registNum; // 税号 - @ApiModelProperty("法人") - private String legalName; // 法人 - @ApiModelProperty("采购员") - private String purchaser; // 采购员 - @ApiModelProperty("排序") - private Integer sortNo; // 排序 - @ApiModelProperty("开票类型key") - private String billingTypeKey; // 开票类型key - @ApiModelProperty("开票类型value") - private String billingTypeValue; // 开票类型value - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - @ApiModelProperty("开户行信息") - private List baseSupplierBankList; -} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoMapper.java b/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoMapper.java deleted file mode 100644 index 277a5ca..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoMapper.java +++ /dev/null @@ -1,67 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierinfo; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.Update; - -import java.util.List; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierInfoMapper.java
- * Class: com.yxt.anrui.as.biz.basesupplierinfo.BaseSupplierInfoMapper
- * Description: 供应商信息.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Mapper -public interface BaseSupplierInfoMapper extends BaseMapper { - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from base_supplier_info") - List selectListVo(); - - @Update("update base_supplier_info set isDelete = '1' where sid = #{sid}") - int updateBySidIsDelete(String sid); - - @Select("select * from base_supplier_info") - List choiceSupplierInfo(String createOrgSid); -} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoMapper.xml b/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoMapper.xml deleted file mode 100644 index 6c3550c..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoQuery.java b/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoQuery.java deleted file mode 100644 index ad495fb..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoQuery.java +++ /dev/null @@ -1,62 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierinfo; - - -import com.yxt.common.core.query.Query; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfoQuery.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoQuery
- * Description: 供应商信息 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商信息 查询条件", description = "供应商信息 查询条件") -public class BaseSupplierInfoQuery implements Query { - - @ApiModelProperty("供应商名称") - private String supplierName; - @ApiModelProperty("供应商类型") - private String supplierTypeName; - @ApiModelProperty("电话") - private String contactTelePhone; - @ApiModelProperty("联系人") - private String contactName; - - @ApiModelProperty("其他查询条件") - private String otherQuery; -} diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoService.java b/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoService.java deleted file mode 100644 index 77c7570..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoService.java +++ /dev/null @@ -1,168 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierinfo; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.goods.biz.base.basesupplierBank.BaseSupplierBank; -import com.yxt.goods.biz.base.basesupplierBank.BaseSupplierBankDetailsVo; -import com.yxt.goods.biz.base.basesupplierBank.BaseSupplierBankDto; -import com.yxt.goods.biz.base.basesupplierBank.BaseSupplierBankService; -import com.yxt.goods.feign.portal.sysorganization.SysOrganizationFeign; -import com.yxt.goods.feign.portal.sysstafforg.SysStaffOrgFeign; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierInfoService.java
- * Class: com.yxt.anrui.as.biz.basesupplierinfo.BaseSupplierInfoService
- * Description: 供应商信息 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Service -public class BaseSupplierInfoService extends MybatisBaseService { - - @Autowired - private SysStaffOrgFeign sysStaffOrgFeign; - @Autowired - private SysOrganizationFeign sysOrganizationFeign; - @Autowired - private BaseSupplierBankService baseSupplierBankService; - - public PagerVo listPageVo(PagerQuery pq) { - BaseSupplierInfoQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper(); - if (StringUtils.isNotBlank(query.getSupplierName())){ - qw.like("supplierName",query.getSupplierName()); - } - if (StringUtils.isNotBlank(query.getSupplierTypeName())){ - qw.like("supplierTypeName",query.getSupplierTypeName()); - } - if (StringUtils.isNotBlank(query.getContactTelePhone())){ - qw.like("contactTelePhone",query.getContactTelePhone()); - } - if (StringUtils.isNotBlank(query.getContactName())){ - qw.like("contactName",query.getContactName()); - } - if (StringUtils.isNotBlank(query.getOtherQuery())){ - qw.and(wrapper -> wrapper.like("supplierName", query.getOtherQuery()).or().like("supplierPY", query.getOtherQuery()).or().like("contactTelePhone",query.getOtherQuery())); - } - qw.eq("isDelete",0); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public ResultBean saveOrUpdateDto(BaseSupplierInfoDto dto){ - ResultBean rb = ResultBean.fireFail(); - String dtoSid = dto.getSid(); - List baseSupplierBankDtoList = dto.getBaseSupplierBankList(); - if (baseSupplierBankDtoList == null || baseSupplierBankDtoList.size() == 0){ - return rb.setMsg("开户行信息不能为空"); - } - if (StringUtils.isBlank(dtoSid)) { - String sid = this.insertByDto(dto); - for (BaseSupplierBankDto baseSupplierBankDto : baseSupplierBankDtoList) { - baseSupplierBankDto.setSupplierSid(sid); - baseSupplierBankService.saveOrUpdateDto(baseSupplierBankDto); - } - return rb.success(); - } - this.updateByDto(dto); - for (BaseSupplierBankDto baseSupplierBankDto : baseSupplierBankDtoList) { - String bankSid = baseSupplierBankDto.getSid(); - if(StringUtils.isNotBlank(bankSid)){ - BaseSupplierBank baseSupplierBank = baseSupplierBankService.fetchBySid(bankSid); - BeanUtil.copyProperties(baseSupplierBankDto,baseSupplierBank,"sid"); - baseSupplierBank.setSupplierSid(dtoSid); - baseSupplierBankService.updateById(baseSupplierBank); - }else{ - BaseSupplierBank baseSupplierBank = new BaseSupplierBank(); - BeanUtil.copyProperties(baseSupplierBankDto,baseSupplierBank,"sid"); - baseSupplierBank.setSupplierSid(dtoSid); - baseSupplierBankService.insert(baseSupplierBank); - } - } - return rb.success(); - } - - public String insertByDto(BaseSupplierInfoDto dto){ - BaseSupplierInfo entity = new BaseSupplierInfo(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - return entity.getSid(); - } - - public void updateByDto(BaseSupplierInfoDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - return; - } - BaseSupplierInfo entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public BaseSupplierInfoDetailsVo fetchDetailsVoBySid(String sid){ - BaseSupplierInfo entity = fetchBySid(sid); - BaseSupplierInfoDetailsVo vo = new BaseSupplierInfoDetailsVo(); - BeanUtil.copyProperties(entity, vo); - List baseSupplierBankDetailsVos = baseSupplierBankService.selectBySupplierSid(sid); - vo.setBaseSupplierBankList(baseSupplierBankDetailsVos); - return vo; - } - - public void delAll(String[] sids) { - for (String sid : sids) { - //删除厂商基础信息 - int count = baseMapper.updateBySidIsDelete(sid); - //删除厂商开户行信息 - int i = baseSupplierBankService.deleteBySupplierSid(sid); - } - } - - public List choiceSupplierInfo(String createOrgSid) { - List baseSupplierInfoChoiceList = baseMapper.choiceSupplierInfo(createOrgSid); - return baseSupplierInfoChoiceList; - } -} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoVo.java b/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoVo.java deleted file mode 100644 index 6ae8783..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesupplierinfo/BaseSupplierInfoVo.java +++ /dev/null @@ -1,65 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesupplierinfo; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfoVo.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo
- * Description: 供应商信息 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商信息 视图数据对象", description = "供应商信息 视图数据对象") -public class BaseSupplierInfoVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("供应商名称") - private String supplierName; - @ApiModelProperty("供应商类型") - private String supplierTypeName; - @ApiModelProperty("详细地址") - private String address; - @ApiModelProperty("电话") - private String contactTelePhone; - @ApiModelProperty("联系人") - private String contactName; - @ApiModelProperty("手机") - private String contactMobile; -} diff --git a/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierType.java b/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierType.java deleted file mode 100644 index b1bf3dc..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierType.java +++ /dev/null @@ -1,62 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesuppliertype; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierType.java
- * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierType
- * Description: 供应商类型.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商类型", description = "供应商类型") -@TableName("base_supplier_type") -public class BaseSupplierType extends BaseEntity { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("供应商类型名称") - private String supplierTypeName; // 供应商类型名称 - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - -} 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 deleted file mode 100644 index bfa4ba0..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeDetailsVo.java +++ /dev/null @@ -1,61 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesuppliertype; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierTypeVo.java
- * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeVo
- * Description: 供应商类型 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商类型 视图数据详情", description = "供应商类型 视图数据详情") -public class BaseSupplierTypeDetailsVo implements Vo { - private String sid; // sid - - @ApiModelProperty("供应商类型名称") - private String supplierTypeName; // 供应商类型名称 - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - -} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeDto.java b/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeDto.java deleted file mode 100644 index 1b74e6d..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeDto.java +++ /dev/null @@ -1,62 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesuppliertype; - - -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierTypeDto.java
- * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeDto
- * Description: 供应商类型 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商类型 数据传输对象", description = "供应商类型 数据传输对象") -public class BaseSupplierTypeDto implements Dto { - - private String sid; // sid - - @ApiModelProperty("供应商类型名称") - private String supplierTypeName; // 供应商类型名称 - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - -} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeMapper.java b/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeMapper.java deleted file mode 100644 index 823612e..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeMapper.java +++ /dev/null @@ -1,60 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesuppliertype; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierTypeMapper.java
- * Class: com.yxt.anrui.as.biz.basesuppliertype.BaseSupplierTypeMapper
- * Description: 供应商类型.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Mapper -public interface BaseSupplierTypeMapper extends BaseMapper { - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from base_supplier_type") - List selectListVo(); -} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeMapper.xml b/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeMapper.xml deleted file mode 100644 index 769f010..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeQuery.java b/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeQuery.java deleted file mode 100644 index e908a60..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeQuery.java +++ /dev/null @@ -1,60 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesuppliertype; - - -import com.yxt.common.core.query.Query; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierTypeQuery.java
- * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeQuery
- * Description: 供应商类型 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商类型 查询条件", description = "供应商类型 查询条件") -public class BaseSupplierTypeQuery implements Query { - - @ApiModelProperty("供应商类型名称") - private String supplierTypeName; // 供应商类型名称 - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - -} diff --git a/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeService.java b/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeService.java deleted file mode 100644 index 8518f66..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeService.java +++ /dev/null @@ -1,94 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesuppliertype; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.vo.PagerVo; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierTypeService.java
- * Class: com.yxt.anrui.as.biz.basesuppliertype.BaseSupplierTypeService
- * Description: 供应商类型 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Service -public class BaseSupplierTypeService extends MybatisBaseService { - - public PagerVo listPageVo(PagerQuery pq) { - BaseSupplierTypeQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(BaseSupplierTypeDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(BaseSupplierTypeDto dto){ - BaseSupplierType entity = new BaseSupplierType(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(BaseSupplierTypeDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - return; - } - BaseSupplierType entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public BaseSupplierTypeDetailsVo fetchDetailsVoBySid(String sid){ - BaseSupplierType entity = fetchBySid(sid); - BaseSupplierTypeDetailsVo vo = new BaseSupplierTypeDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } -} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeVo.java b/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeVo.java deleted file mode 100644 index 3ae2dea..0000000 --- a/src/main/java/com/yxt/goods/biz/base/basesuppliertype/BaseSupplierTypeVo.java +++ /dev/null @@ -1,62 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.goods.biz.base.basesuppliertype; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierTypeVo.java
- * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeVo
- * Description: 供应商类型 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-13 16:51:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商类型 视图数据对象", description = "供应商类型 视图数据对象") -public class BaseSupplierTypeVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("供应商类型名称") - private String supplierTypeName; // 供应商类型名称 - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - -} diff --git a/src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCartMapper.java b/src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCartMapper.java deleted file mode 100644 index d5878bd..0000000 --- a/src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCartMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.yxt.goods.biz.base.shoppingcart; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2023/12/8 9:19 - */ -@Mapper -public interface ShoppingCartMapper extends BaseMapper { - List ShoppingCartList(@Param("customerSid")String customerSid, - @Param("brandId")String brandId, - @Param("periodValidity")String periodValidity); -} diff --git a/src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingGoodsVo.java b/src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingGoodsVo.java deleted file mode 100644 index 778f7a4..0000000 --- a/src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingGoodsVo.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.yxt.goods.biz.base.shoppingcart; - -/** - * @author wangpengfei - * @date 2024/1/17 14:03 - */ -public class ShoppingGoodsVo { -} diff --git a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfo.java b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfo.java similarity index 81% rename from src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfo.java rename to src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfo.java index 9cf396f..d7fec86 100644 --- a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfo.java +++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfo.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basebrandinfo; +package com.yxt.goods.biz.goodsbrandinfo; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @date 2024/2/26 13:36 */ @Data -public class BaseBrandInfo extends BaseEntity { +public class GoodsBrandInfo extends BaseEntity { private String brandName;//品牌代码 private String brandCode;//品牌名称 diff --git a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoDto.java b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoDto.java similarity index 88% rename from src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoDto.java rename to src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoDto.java index 250c12c..845db4e 100644 --- a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoDto.java +++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoDto.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basebrandinfo; +package com.yxt.goods.biz.goodsbrandinfo; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; @@ -11,7 +11,7 @@ import java.util.Date; * @date 2024/2/26 13:38 */ @Data -public class BaseBrandInfoDto implements Dto { +public class GoodsBrandInfoDto implements Dto { private String id; private String sid; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeMapper.java b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.java similarity index 61% rename from src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeMapper.java rename to src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.java index 0e636cc..9d7b318 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeMapper.java +++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodstype; +package com.yxt.goods.biz.goodsbrandinfo; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Param; * @date 2024/2/26 13:40 */ @Mapper -public interface BaseGoodsTypeMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +public interface GoodsBrandInfoMapper extends BaseMapper { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoMapper.xml b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml similarity index 67% rename from src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoMapper.xml rename to src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml index 53b13f0..f856eb4 100644 --- a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml @@ -1,10 +1,10 @@ - + - select * from base_brand_info diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuQuery.java b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoQuery.java similarity index 61% rename from src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuQuery.java rename to src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoQuery.java index 455f291..3ca0652 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoQuery.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodssku; +package com.yxt.goods.biz.goodsbrandinfo; import com.yxt.common.core.query.Query; import lombok.Data; @@ -8,6 +8,6 @@ import lombok.Data; * @date 2024/2/26 13:37 */ @Data -public class BaseGoodsSkuQuery implements Query { +public class GoodsBrandInfoQuery implements Query { private String name; } diff --git a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoService.java b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoService.java similarity index 71% rename from src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoService.java rename to src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoService.java index 68dfb05..4f1dde0 100644 --- a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoService.java +++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoService.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basebrandinfo; +package com.yxt.goods.biz.goodsbrandinfo; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; @@ -11,7 +11,6 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.goods.biz.base.basegoodstype.BaseGoodsType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,22 +24,22 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Service -public class BaseBrandInfoService extends MybatisBaseService { +public class GoodsBrandInfoService extends MybatisBaseService { @Autowired private FileUploadComponent fileUploadComponent; - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - BaseBrandInfoQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + GoodsBrandInfoQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if(StringUtils.isNotBlank(query.getName())){ qw.like("brandName",query.getName()); } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); records.removeAll(Collections.singleton(null)); // if (!records.isEmpty()) { // for (BaseBrandInfoVo record : records) { @@ -51,17 +50,17 @@ public class BaseBrandInfoService extends MybatisBaseService> listAll() { + public ResultBean> listAll() { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); return rb.success().setData(pagging); } - public ResultBean saveOrUpdate(BaseBrandInfoDto dto) { + public ResultBean saveOrUpdate(GoodsBrandInfoDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); - BaseBrandInfo wmsGoodsBrand = fetchBySid(dto.getSid()); + GoodsBrandInfo wmsGoodsBrand = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsGoodsBrand, "id", "sid"); // if (StringUtils.isNotBlank(dto.getBigPic())) { // String urlPrefix = fileUploadComponent.getUrlPrefix(); @@ -71,11 +70,11 @@ public class BaseBrandInfoService extends MybatisBaseService().eq("brandName",dto.getBrandName())); + GoodsBrandInfo goods=baseMapper.selectOne(new QueryWrapper().eq("brandName",dto.getBrandName())); if(null!=goods){ return rb.setMsg("商品名不能重复"); } - BaseBrandInfo wmsGoodsBrand = new BaseBrandInfo(); + GoodsBrandInfo wmsGoodsBrand = new GoodsBrandInfo(); sid = wmsGoodsBrand.getSid(); BeanUtil.copyProperties(dto, wmsGoodsBrand, "id", "sid"); wmsGoodsBrand.setCreateTime(new DateTime()); @@ -89,10 +88,10 @@ public class BaseBrandInfoService extends MybatisBaseService initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - BaseBrandInfoVo vo = new BaseBrandInfoVo(); - BaseBrandInfo wmsGoodsBrand = fetchBySid(sid); + GoodsBrandInfoVo vo = new GoodsBrandInfoVo(); + GoodsBrandInfo wmsGoodsBrand = fetchBySid(sid); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); BeanUtil.copyProperties(wmsGoodsBrand, vo); // if (null != wmsGoodsBrand) { @@ -109,7 +108,7 @@ public class BaseBrandInfoService extends MybatisBaseService getBrandByName(String name) { + public ResultBean getBrandByName(String name) { ResultBean rb = ResultBean.fireFail(); - BaseBrandInfo type=baseMapper.selectOne(new QueryWrapper().eq("brandName",name)); + GoodsBrandInfo type=baseMapper.selectOne(new QueryWrapper().eq("brandName",name)); return rb.success().setData(type); } } diff --git a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoVo.java b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoVo.java similarity index 90% rename from src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoVo.java rename to src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoVo.java index a211845..1674323 100644 --- a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoVo.java +++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoVo.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basebrandinfo; +package com.yxt.goods.biz.goodsbrandinfo; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; @@ -11,7 +11,7 @@ import java.util.Date; * @date 2024/2/26 13:37 */ @Data -public class BaseBrandInfoVo implements Vo { +public class GoodsBrandInfoVo implements Vo { private String id; private String sid; private String lockVersion; diff --git a/src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrand.java b/src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrand.java similarity index 68% rename from src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrand.java rename to src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrand.java index 98f65fe..7bd133a 100644 --- a/src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrand.java +++ b/src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrand.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basecategorybrand; +package com.yxt.goods.biz.goodscategorybrand; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @date 2024/4/8 9:34 */ @Data -public class BaseCategoryBrand extends BaseEntity { +public class GoodsCategoryBrand extends BaseEntity { private String categorySid;//商品分类sid private String brandSid;//品牌sid diff --git a/src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrandDto.java b/src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrandDto.java similarity index 83% rename from src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrandDto.java rename to src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrandDto.java index 1b43086..055b814 100644 --- a/src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrandDto.java +++ b/src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrandDto.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basecategorybrand; +package com.yxt.goods.biz.goodscategorybrand; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -10,7 +10,7 @@ import java.util.Date; * @date 2024/4/8 9:34 */ @Data -public class BaseCategoryBrandDto { +public class GoodsCategoryBrandDto { private String id; private String sid; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrandMapper.java b/src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrandMapper.java similarity index 50% rename from src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrandMapper.java rename to src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrandMapper.java index e688995..7dbdc29 100644 --- a/src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrandMapper.java +++ b/src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrandMapper.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basecategorybrand; +package com.yxt.goods.biz.goodscategorybrand; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,10 +14,10 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Mapper -public interface BaseCategoryBrandMapper extends BaseMapper { +public interface GoodsCategoryBrandMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List getSkusBySpuSid(@Param("spuSid")String spuSid); - BaseCategoryBrandVo getVoBySid(@Param("sid")String sid); + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + List getSkusBySpuSid(@Param("spuSid")String spuSid); + GoodsCategoryBrandVo getVoBySid(@Param("sid")String sid); } diff --git a/src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrandMapper.xml b/src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrandMapper.xml similarity index 70% rename from src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrandMapper.xml rename to src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrandMapper.xml index 09033d9..c1b63d1 100644 --- a/src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrandMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrandMapper.xml @@ -1,10 +1,10 @@ - + - select s.*,a.goodsTypeName as categoryName ,b.brandName as brandName; from base_category_brand s left join base_goods_type a on a.sid =s.ceategorySid @@ -13,13 +13,13 @@ ${ew.sqlSegment} - select s.*, s.own_spec as ownSpec from base_goods_sku s where s.goodsSpuSid = #{spuSid} - select s.*,a.goodsTypeName as categoryName ,b.brandName as brandName; from base_category_brand s left join base_goods_type a on a.sid =s.ceategorySid diff --git a/src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrandQuery.java b/src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrandQuery.java similarity index 58% rename from src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrandQuery.java rename to src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrandQuery.java index 77c83a9..919da51 100644 --- a/src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrandQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrandQuery.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basecategorybrand; +package com.yxt.goods.biz.goodscategorybrand; import com.yxt.common.core.query.Query; import lombok.Data; @@ -8,6 +8,6 @@ import lombok.Data; * @date 2024/4/8 9:34 */ @Data -public class BaseCategoryBrandQuery implements Query { +public class GoodsCategoryBrandQuery implements Query { private String name; } diff --git a/src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrandService.java b/src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrandService.java similarity index 64% rename from src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrandService.java rename to src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrandService.java index f251d36..b659f20 100644 --- a/src/main/java/com/yxt/goods/biz/base/basecategorybrand/BaseCategoryBrandService.java +++ b/src/main/java/com/yxt/goods/biz/goodscategorybrand/GoodsCategoryBrandService.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basecategorybrand; +package com.yxt.goods.biz.goodscategorybrand; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; @@ -23,35 +23,35 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Service -public class BaseCategoryBrandService extends MybatisBaseService { +public class GoodsCategoryBrandService extends MybatisBaseService { @Autowired private FileUploadComponent fileUploadComponent; - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - BaseCategoryBrandQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + GoodsCategoryBrandQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getName())) { qw.like("goodsName", query.getName()); } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } @Transactional - public ResultBean saveOrUpdate(BaseCategoryBrandDto dto) { + public ResultBean saveOrUpdate(GoodsCategoryBrandDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); - BaseCategoryBrand wmsGoods = fetchBySid(dto.getSid()); + GoodsCategoryBrand wmsGoods = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); wmsGoods.setModifyTime(new Date()); baseMapper.updateById(wmsGoods); } else { - BaseCategoryBrand wmsGoods = new BaseCategoryBrand(); + GoodsCategoryBrand wmsGoods = new GoodsCategoryBrand(); BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); wmsGoods.setCreateTime(new DateTime()); baseMapper.insert(wmsGoods); @@ -59,19 +59,19 @@ public class BaseCategoryBrandService extends MybatisBaseService saveOrUpdate(List dtos) { + public ResultBean saveOrUpdate(List dtos) { ResultBean rb = ResultBean.fireFail(); - for (BaseCategoryBrandDto dto : dtos) { - BaseCategoryBrand sku=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); + for (GoodsCategoryBrandDto dto : dtos) { + GoodsCategoryBrand sku=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); String sid = ""; if (null!=sku) { sid = dto.getSid(); - BaseCategoryBrand wmsGoods = fetchBySid(dto.getSid()); + GoodsCategoryBrand wmsGoods = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsGoods); wmsGoods.setModifyTime(new Date()); baseMapper.updateById(wmsGoods); } else { - BaseCategoryBrand wmsGoods = new BaseCategoryBrand(); + GoodsCategoryBrand wmsGoods = new GoodsCategoryBrand(); BeanUtil.copyProperties(dto, wmsGoods); wmsGoods.setCreateTime(new DateTime()); baseMapper.insert(wmsGoods); @@ -81,22 +81,22 @@ public class BaseCategoryBrandService extends MybatisBaseService initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - BaseCategoryBrandVo vo = baseMapper.getVoBySid(sid); + GoodsCategoryBrandVo vo = baseMapper.getVoBySid(sid); return rb.success().setData(vo); } - public ResultBean> getSkusBySpuSid(String sid) { + public ResultBean> getSkusBySpuSid(String sid) { ResultBean rb = ResultBean.fireFail(); - List vo = baseMapper.getSkusBySpuSid(sid); + List vo = baseMapper.getSkusBySpuSid(sid); return rb.success().setData(vo); } public ResultBean delete(String sid) { ResultBean rb = ResultBean.fireFail(); - BaseCategoryBrand wmsGoods = fetchBySid(sid); + GoodsCategoryBrand wmsGoods = fetchBySid(sid); if (null != wmsGoods) { baseMapper.deleteById(wmsGoods.getId()); } @@ -105,7 +105,7 @@ public class BaseCategoryBrandService extends MybatisBaseService { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +public interface GoodsManufacturerMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List getAllTypeByUseOrgSid(@Param("useOrgSid") String useOrgSid); + List getAllTypeByUseOrgSid(@Param("useOrgSid") String useOrgSid); } diff --git a/src/main/java/com/yxt/goods/biz/base/basemanufacturer/BaseManufacturerMapper.xml b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml similarity index 68% rename from src/main/java/com/yxt/goods/biz/base/basemanufacturer/BaseManufacturerMapper.xml rename to src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml index d5ea849..756f689 100644 --- a/src/main/java/com/yxt/goods/biz/base/basemanufacturer/BaseManufacturerMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml @@ -1,10 +1,10 @@ - + - select * from base_manufacturer @@ -12,7 +12,7 @@ ${ew.sqlSegment} - select * from base_manufacturer where useOrgSid = #{useOrgSid} diff --git a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerQuery.java b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerQuery.java new file mode 100644 index 0000000..561deb1 --- /dev/null +++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerQuery.java @@ -0,0 +1,13 @@ +package com.yxt.goods.biz.goodsmanufacturer; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class GoodsManufacturerQuery implements Query { + private String name; +} diff --git a/src/main/java/com/yxt/goods/biz/base/basemanufacturer/BaseManufacturerService.java b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java similarity index 63% rename from src/main/java/com/yxt/goods/biz/base/basemanufacturer/BaseManufacturerService.java rename to src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java index 4c97297..27cfe24 100644 --- a/src/main/java/com/yxt/goods/biz/base/basemanufacturer/BaseManufacturerService.java +++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basemanufacturer; +package com.yxt.goods.biz.goodsmanufacturer; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; @@ -10,7 +10,6 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.goods.biz.base.basegoodsunit.BaseGoodsUnit; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; @@ -22,40 +21,40 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Service -public class BaseManufacturerService extends MybatisBaseService { +public class GoodsManufacturerService extends MybatisBaseService { - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - BaseManufacturerQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + GoodsManufacturerQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if(StringUtils.isNotBlank(query.getName())){ qw.like("goodsTypeName",query.getName()); } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); return rb.success().setData(p); } - public ResultBean> listAll() { + public ResultBean> listAll() { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); return rb.success().setData(pagging); } - public ResultBean saveOrUpdate(BaseManufacturerDto dto) { + public ResultBean saveOrUpdate(GoodsManufacturerDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); - BaseManufacturer wmsManufacturer = fetchBySid(dto.getSid()); + GoodsManufacturer wmsManufacturer = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsManufacturer, "id", "sid"); wmsManufacturer.setModifyTime(new Date()); baseMapper.updateById(wmsManufacturer); } else { - BaseManufacturer wmsManufacturer = new BaseManufacturer(); + GoodsManufacturer wmsManufacturer = new GoodsManufacturer(); sid = wmsManufacturer.getSid(); BeanUtil.copyProperties(dto, wmsManufacturer, "id", "sid"); wmsManufacturer.setCreateTime(new DateTime()); @@ -69,10 +68,10 @@ public class BaseManufacturerService extends MybatisBaseService initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - BaseManufacturerVo vo = new BaseManufacturerVo(); - BaseManufacturer wmsManufacturer = fetchBySid(sid); + GoodsManufacturerVo vo = new GoodsManufacturerVo(); + GoodsManufacturer wmsManufacturer = fetchBySid(sid); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (null != wmsManufacturer) { BeanUtil.copyProperties(wmsManufacturer, vo); @@ -88,7 +87,7 @@ public class BaseManufacturerService extends MybatisBaseService> getAllTypeByUseOrgSid(String useOrgSid) { + public ResultBean> getAllTypeByUseOrgSid(String useOrgSid) { ResultBean rb = ResultBean.fireFail(); - List list = baseMapper.getAllTypeByUseOrgSid(useOrgSid); + List list = baseMapper.getAllTypeByUseOrgSid(useOrgSid); return rb.success().setData(list); } - public ResultBean getManufacturerByName(String name) { + public ResultBean getManufacturerByName(String name) { ResultBean rb = ResultBean.fireFail(); - BaseManufacturer type=baseMapper.selectOne(new QueryWrapper().eq("manufacturerName",name)); + GoodsManufacturer type=baseMapper.selectOne(new QueryWrapper().eq("manufacturerName",name)); return rb.success().setData(type); } } diff --git a/src/main/java/com/yxt/goods/biz/base/basemanufacturer/BaseManufacturerVo.java b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerVo.java similarity index 91% rename from src/main/java/com/yxt/goods/biz/base/basemanufacturer/BaseManufacturerVo.java rename to src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerVo.java index d1428dd..e902b9a 100644 --- a/src/main/java/com/yxt/goods/biz/base/basemanufacturer/BaseManufacturerVo.java +++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerVo.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basemanufacturer; +package com.yxt.goods.biz.goodsmanufacturer; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; @@ -11,7 +11,7 @@ import java.util.Date; * @date 2024/2/26 13:37 */ @Data -public class BaseManufacturerVo implements Vo { +public class GoodsManufacturerVo implements Vo { private String id; private String sid; private String lockVersion; diff --git a/src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCart.java b/src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCart.java similarity index 88% rename from src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCart.java rename to src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCart.java index af72f31..343a420 100644 --- a/src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCart.java +++ b/src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCart.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.shoppingcart; +package com.yxt.goods.biz.goodsshoppingcart; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -11,7 +11,7 @@ import java.util.UUID; * @date 2023/12/8 9:10 */ @Data -public class ShoppingCart { +public class GoodsShoppingCart { private String id; private String sid= UUID.randomUUID().toString(); @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCartDto.java b/src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCartDto.java similarity index 86% rename from src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCartDto.java rename to src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCartDto.java index 38dd430..9072239 100644 --- a/src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCartDto.java +++ b/src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCartDto.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.shoppingcart; +package com.yxt.goods.biz.goodsshoppingcart; import com.yxt.common.core.dto.Dto; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @date 2023/12/8 9:11 */ @Data -public class ShoppingCartDto implements Dto { +public class GoodsShoppingCartDto implements Dto { diff --git a/src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCartMapper.java b/src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCartMapper.java new file mode 100644 index 0000000..1a28f05 --- /dev/null +++ b/src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCartMapper.java @@ -0,0 +1,18 @@ +package com.yxt.goods.biz.goodsshoppingcart; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/12/8 9:19 + */ +@Mapper +public interface GoodsShoppingCartMapper extends BaseMapper { + List ShoppingCartList(@Param("customerSid")String customerSid, + @Param("brandId")String brandId, + @Param("periodValidity")String periodValidity); +} diff --git a/src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCartMapper.xml b/src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCartMapper.xml similarity index 86% rename from src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCartMapper.xml rename to src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCartMapper.xml index a20a439..c712843 100644 --- a/src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCartMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCartMapper.xml @@ -1,11 +1,11 @@ - + - select r.*,s.unitName, s.price as jPrice, diff --git a/src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCartQuery.java b/src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCartQuery.java similarity index 72% rename from src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCartQuery.java rename to src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCartQuery.java index bc3be86..0d43070 100644 --- a/src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCartQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCartQuery.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.shoppingcart; +package com.yxt.goods.biz.goodsshoppingcart; import com.yxt.common.core.query.Query; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @date 2023/12/8 9:11 */ @Data -public class ShoppingCartQuery implements Query { +public class GoodsShoppingCartQuery implements Query { private String customerSid; //客户 private String affiliation; //类型 private String brandId; diff --git a/src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCartService.java b/src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCartService.java similarity index 86% rename from src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCartService.java rename to src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCartService.java index 44ebe17..30481f5 100644 --- a/src/main/java/com/yxt/goods/biz/base/shoppingcart/ShoppingCartService.java +++ b/src/main/java/com/yxt/goods/biz/goodsshoppingcart/GoodsShoppingCartService.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.shoppingcart; +package com.yxt.goods.biz.goodsshoppingcart; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,26 +19,26 @@ import java.util.List; * @date 2023/12/8 9:19 */ @Service -public class ShoppingCartService extends MybatisBaseService { +public class GoodsShoppingCartService extends MybatisBaseService { @Autowired private FileUploadComponent fileUploadComponent; - public ResultBean save(ShoppingCartDto dto) { + public ResultBean save(GoodsShoppingCartDto dto) { ResultBean rb = ResultBean.fireFail(); - ShoppingCart entity = new ShoppingCart(); + GoodsShoppingCart entity = new GoodsShoppingCart(); if(StringUtils.isBlank(dto.getCustomerSid())){ return rb.setMsg("参数不全"); } if(StringUtils.isBlank(dto.getGoodsSid())){ return rb.setMsg("参数不全"); } - List list = baseMapper.selectList(new QueryWrapper().eq("customerSid", dto.getCustomerSid()) + List list = baseMapper.selectList(new QueryWrapper().eq("customerSid", dto.getCustomerSid()) .eq("goodsSid", dto.getGoodsSid()) .eq("affiliation", dto.getAffiliation())); if (list.size() > 0) { // list.get(0).setGoodsNumber(String.valueOf(Double.valueOf(dto.getGoodsNumber())+Double.valueOf(list.get(0).getGoodsNumber()))); if (dto.getGoodsNumber().equals("0")) { - baseMapper.delete(new QueryWrapper().eq("customerSid", dto.getCustomerSid()) + baseMapper.delete(new QueryWrapper().eq("customerSid", dto.getCustomerSid()) .eq("goodsSid", dto.getGoodsSid()) .eq("affiliation", dto.getAffiliation())); } else { @@ -52,9 +52,9 @@ public class ShoppingCartService extends MybatisBaseService> shoppingCartList(ShoppingCartQuery query) { + public ResultBean> shoppingCartList(GoodsShoppingCartQuery query) { ResultBean rb = ResultBean.fireFail(); - ShoppingCart entity = new ShoppingCart(); + GoodsShoppingCart entity = new GoodsShoppingCart(); if(StringUtils.isBlank(query.getCustomerSid())){ return rb.setMsg("参数不全"); } @@ -64,7 +64,7 @@ public class ShoppingCartService extends MybatisBaseService list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId(),periodValidity); + List list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId(),periodValidity); list.forEach(s -> { s.setTotalPrice(removeZeros(String.valueOf((Double.valueOf(s.getJPrice()) * Double.valueOf(s.getGoodsNumber()))))); s.setIconUrl(fileUploadComponent.getUrlPrefix() + s.getIconUrl()); @@ -73,11 +73,11 @@ public class ShoppingCartService extends MybatisBaseService list= baseMapper.selectList(new QueryWrapper().eq("sid",dto.getSid())); - List list = baseMapper.selectList(new QueryWrapper().eq("customerSid", dto.getCustomerSid()) + List list = baseMapper.selectList(new QueryWrapper().eq("customerSid", dto.getCustomerSid()) .eq("goodsSid", dto.getGoodsSid()) .eq("affiliation", dto.getAffiliation())); if (list.size() > 0) { @@ -89,11 +89,11 @@ public class ShoppingCartService extends MybatisBaseService list= baseMapper.selectList(new QueryWrapper().eq("sid",dto.getSid())); - List list = baseMapper.selectList(new QueryWrapper().eq("customerSid", dto.getCustomerSid()) + List list = baseMapper.selectList(new QueryWrapper().eq("customerSid", dto.getCustomerSid()) .eq("goodsSid", dto.getGoodsSid()) .eq("affiliation", dto.getAffiliation())); if (list.size() > 0) { @@ -106,12 +106,12 @@ public class ShoppingCartService extends MybatisBaseService().eq("sid ", sid)); + GoodsShoppingCart entity = new GoodsShoppingCart(); + baseMapper.delete(new QueryWrapper().eq("sid ", sid)); return rb.success().setMsg("成功"); } - public ResultBean getGoodsWeight(ShoppingCartQuery query) { + public ResultBean getGoodsWeight(GoodsShoppingCartQuery query) { ResultBean rb = new ResultBean().fail(); if(StringUtils.isBlank(query.getCustomerSid())){ return rb.setMsg("参数不全"); @@ -122,7 +122,7 @@ public class ShoppingCartService extends MybatisBaseService list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId(),periodValidity); + List list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId(),periodValidity); double price = 0; double standbyPrice =0; double weight = 0; @@ -158,7 +158,7 @@ public class ShoppingCartService extends MybatisBaseService { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + List getSkusBySpuSid(@Param("spuSid")String spuSid); + GoodsSkuVo getSkuBySid(@Param("sid")String sid); + + IPage getSelectList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); + + IPage purGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +} diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuMapper.xml b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml similarity index 76% rename from src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuMapper.xml rename to src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml index d8ce8e4..52945ff 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml @@ -1,10 +1,10 @@ - + - select s.*,s.own_spec as ownSpec,a.goodsName from base_goods_sku s left join base_goods_spu a on a.sid=s.goodsSpuSid @@ -12,20 +12,20 @@ ${ew.sqlSegment} - select s.*, s.own_spec as ownSpec from base_goods_sku s where s.goodsSpuSid = #{spuSid} - select *, s.own_spec as ownSpec from base_goods_sku s where s.sid = #{sid} - select sku.sid goodsSkuSid, spu.sid as goodsSpuSid, spu.goodsName goodsSpuName, @@ -40,7 +40,7 @@ - SELECT s.sid, s.goodsSkuCode, diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuPurSelectList.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectList.java similarity index 88% rename from src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuPurSelectList.java rename to src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectList.java index ca465ef..cd72550 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuPurSelectList.java +++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectList.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodssku; +package com.yxt.goods.biz.goodssku; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @date: 2024/3/21 **/ @Data -public class BaseGoodsSkuPurSelectList { +public class GoodsSkuPurSelectList { //sid private String sid; diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuPurSelectQuery.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectQuery.java similarity index 83% rename from src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuPurSelectQuery.java rename to src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectQuery.java index adbae98..e06fc15 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuPurSelectQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectQuery.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodssku; +package com.yxt.goods.biz.goodssku; import com.yxt.common.core.query.Query; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/3/21 **/ @Data -public class BaseGoodsSkuPurSelectQuery implements Query { +public class GoodsSkuPurSelectQuery implements Query { //组织sid private String orgSid; diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsspu/BaseGoodsSpuQuery.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuQuery.java similarity index 61% rename from src/main/java/com/yxt/goods/biz/base/basegoodsspu/BaseGoodsSpuQuery.java rename to src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuQuery.java index 4b2b959..a693de1 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsspu/BaseGoodsSpuQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuQuery.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodsspu; +package com.yxt.goods.biz.goodssku; import com.yxt.common.core.query.Query; import lombok.Data; @@ -8,6 +8,6 @@ import lombok.Data; * @date 2024/2/26 13:37 */ @Data -public class BaseGoodsSpuQuery implements Query { +public class GoodsSkuQuery implements Query { private String name; } diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuSelectQuery.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuSelectQuery.java similarity index 63% rename from src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuSelectQuery.java rename to src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuSelectQuery.java index 513efa7..d71a5b2 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuSelectQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuSelectQuery.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodssku; +package com.yxt.goods.biz.goodssku; import com.yxt.common.core.query.Query; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/3/21 **/ @Data -public class BaseGoodsSkuSelectQuery implements Query { +public class GoodsSkuSelectQuery implements Query { private String goodsSkuCode; } diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuService.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java similarity index 52% rename from src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuService.java rename to src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java index 308f719..262e86b 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuService.java +++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java @@ -1,18 +1,17 @@ -package com.yxt.goods.biz.base.basegoodssku; +package com.yxt.goods.biz.goodssku; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendService; -import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendVo; -import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpu; -import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpuDto; -import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpuService; -import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetail; -import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetailService; -import com.yxt.goods.biz.base.basegoodstype.BaseGoodsType; -import com.yxt.goods.biz.base.basegoodstype.BaseGoodsTypeService; +import com.yxt.goods.biz.goodsskuextend.GoodsSkuExtendService; +import com.yxt.goods.biz.goodsskuextend.GoodsSkuExtendVo; +import com.yxt.goods.biz.goodsspu.GoodsSpu; +import com.yxt.goods.biz.goodsspu.GoodsSpuDto; +import com.yxt.goods.biz.goodsspu.GoodsSpuService; +import com.yxt.goods.biz.goodsspudetail.BaseGoodsSpuDetailService; +import com.yxt.goods.biz.goodstype.GoodsType; +import com.yxt.goods.biz.goodstype.GoodsTypeService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -33,60 +32,60 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Service -public class BaseGoodsSkuService extends MybatisBaseService { +public class GoodsSkuService extends MybatisBaseService { @Autowired private FileUploadComponent fileUploadComponent; @Autowired BaseGoodsSpuDetailService baseGoodsSpuDetailService; @Autowired - BaseGoodsSkuExtendService baseGoodsSkuExtendService; + GoodsSkuExtendService goodsSkuExtendService; @Autowired - private BaseGoodsSpuService baseGoodsSpuService; + private GoodsSpuService goodsSpuService; @Autowired - BaseGoodsTypeService baseGoodsTypeService; + GoodsTypeService goodsTypeService; - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - BaseGoodsSkuQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + GoodsSkuQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getName())) { qw.like("goodsName", query.getName()); } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } @Transactional - public ResultBean saveOrUpdate(BaseGoodsSkuDto dto) { + public ResultBean saveOrUpdate(GoodsSkuDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); - BaseGoodsSku wmsGoods = fetchBySid(dto.getSid()); + GoodsSku wmsGoods = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); wmsGoods.setModifyTime(new Date()); baseMapper.updateById(wmsGoods); dto.getBaseGoodsSkuExtend().setGoodsSkuSid(wmsGoods.getSid()); - baseGoodsSkuExtendService.saveOrUpdate(dto.getBaseGoodsSkuExtend()); + goodsSkuExtendService.saveOrUpdate(dto.getBaseGoodsSkuExtend()); } else { - BaseGoodsSku wmsGoods = new BaseGoodsSku(); + GoodsSku wmsGoods = new GoodsSku(); BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); wmsGoods.setCreateTime(new DateTime()); baseMapper.insert(wmsGoods); dto.getBaseGoodsSkuExtend().setGoodsSkuSid(wmsGoods.getSid()); - baseGoodsSkuExtendService.saveOrUpdate(dto.getBaseGoodsSkuExtend()); + goodsSkuExtendService.saveOrUpdate(dto.getBaseGoodsSkuExtend()); } return rb.success().setMsg("成功"); } @Transactional - public ResultBean skuBatchSave(List dtos) { + public ResultBean skuBatchSave(List dtos) { ResultBean rb = ResultBean.fireFail(); - List skus = new ArrayList<>(); - List dtos1=new ArrayList<>(); - for (BaseGoodsSpuDto dto : dtos) { - for (BaseGoodsSkuDto baseGoodsSkus : dto.getBaseGoodsSkus()) { - BaseGoodsSku sku = new BaseGoodsSku(); + List skus = new ArrayList<>(); + List dtos1=new ArrayList<>(); + for (GoodsSpuDto dto : dtos) { + for (GoodsSkuDto baseGoodsSkus : dto.getBaseGoodsSkus()) { + GoodsSku sku = new GoodsSku(); BeanUtil.copyProperties(baseGoodsSkus, sku, "id"); sku.setCreateTime(new DateTime()); skus.add(sku); @@ -94,57 +93,57 @@ public class BaseGoodsSkuService extends MybatisBaseService saveOrUpdate(List dtos) { + public ResultBean saveOrUpdate(List dtos) { ResultBean rb = ResultBean.fireFail(); - for (BaseGoodsSkuDto dto : dtos) { - BaseGoodsSku sku=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); + for (GoodsSkuDto dto : dtos) { + GoodsSku sku=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); String sid = ""; if (null!=sku) { sid = dto.getSid(); - BaseGoodsSku wmsGoods = fetchBySid(dto.getSid()); + GoodsSku wmsGoods = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsGoods); wmsGoods.setModifyTime(new Date()); baseMapper.updateById(wmsGoods); dto.getBaseGoodsSkuExtend().setGoodsSkuSid(wmsGoods.getSid()); - baseGoodsSkuExtendService.saveOrUpdate(dto.getBaseGoodsSkuExtend()); + goodsSkuExtendService.saveOrUpdate(dto.getBaseGoodsSkuExtend()); } else { - BaseGoodsSku wmsGoods = new BaseGoodsSku(); + GoodsSku wmsGoods = new GoodsSku(); BeanUtil.copyProperties(dto, wmsGoods); wmsGoods.setCreateTime(new DateTime()); baseMapper.insert(wmsGoods); dto.getBaseGoodsSkuExtend().setGoodsSkuSid(wmsGoods.getSid()); - baseGoodsSkuExtendService.saveOrUpdate(dto.getBaseGoodsSkuExtend()); + goodsSkuExtendService.saveOrUpdate(dto.getBaseGoodsSkuExtend()); } } return rb.success().setMsg("成功"); } - public ResultBean initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - BaseGoodsSkuVo vo = baseMapper.getSkuBySid(sid); - BaseGoodsSkuExtendVo vo1=baseGoodsSkuExtendService.getExtendBySkuSid(vo.getSid()).getData(); + GoodsSkuVo vo = baseMapper.getSkuBySid(sid); + GoodsSkuExtendVo vo1= goodsSkuExtendService.getExtendBySkuSid(vo.getSid()).getData(); if(vo1==null){ - vo.setBaseGoodsSkuExtend(new BaseGoodsSkuExtendVo()); + vo.setBaseGoodsSkuExtend(new GoodsSkuExtendVo()); } vo.setBaseGoodsSkuExtend(vo1); return rb.success().setData(vo); } - public ResultBean> getSkusBySpuSid(String sid) { + public ResultBean> getSkusBySpuSid(String sid) { ResultBean rb = ResultBean.fireFail(); - List vo = baseMapper.getSkusBySpuSid(sid); + List vo = baseMapper.getSkusBySpuSid(sid); return rb.success().setData(vo); } public ResultBean delete(String sid) { ResultBean rb = ResultBean.fireFail(); - BaseGoodsSku wmsGoods = fetchBySid(sid); + GoodsSku wmsGoods = fetchBySid(sid); if (null != wmsGoods) { baseMapper.deleteById(wmsGoods.getId()); } @@ -153,7 +152,7 @@ public class BaseGoodsSkuService extends MybatisBaseService getDetails(String sid) { - ResultBean rb = ResultBean.fireFail(); - BaseGoodsSkuDetailsVo baseGoodsSkuDetailsVo = new BaseGoodsSkuDetailsVo(); - BaseGoodsSku baseGoodsSku = fetchBySid(sid); - BaseGoodsSpu baseGoodsSpu = baseGoodsSpuService.fetchBySid(baseGoodsSku.getGoodsSpuSid()); - BeanUtil.copyProperties(baseGoodsSku, baseGoodsSkuDetailsVo); - BeanUtil.copyProperties(baseGoodsSpu, baseGoodsSkuDetailsVo); - BaseGoodsType baseGoodsType = baseGoodsTypeService.fetchBySid(baseGoodsSpu.getGoodsTypeSid()); - if (baseGoodsType != null && StringUtils.isNotBlank(baseGoodsType.getIsGoodsID())) { - baseGoodsSkuDetailsVo.setIsGoodsID(Integer.parseInt(baseGoodsType.getIsGoodsID())); - baseGoodsSkuDetailsVo.setGoodsTypeName(baseGoodsType.getGoodsTypeName()); + public ResultBean getDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + GoodsSkuDetailsVo goodsSkuDetailsVo = new GoodsSkuDetailsVo(); + GoodsSku goodsSku = fetchBySid(sid); + GoodsSpu goodsSpu = goodsSpuService.fetchBySid(goodsSku.getGoodsSpuSid()); + BeanUtil.copyProperties(goodsSku, goodsSkuDetailsVo); + BeanUtil.copyProperties(goodsSpu, goodsSkuDetailsVo); + GoodsType goodsType = goodsTypeService.fetchBySid(goodsSpu.getGoodsTypeSid()); + if (goodsType != null && StringUtils.isNotBlank(goodsType.getIsGoodsID())) { + goodsSkuDetailsVo.setIsGoodsID(Integer.parseInt(goodsType.getIsGoodsID())); + goodsSkuDetailsVo.setGoodsTypeName(goodsType.getGoodsTypeName()); } else { - baseGoodsSkuDetailsVo.setIsGoodsID(0); + goodsSkuDetailsVo.setIsGoodsID(0); } - return rb.success().setData(baseGoodsSkuDetailsVo); + return rb.success().setData(goodsSkuDetailsVo); } - public PagerVo getSelectList(PagerQuery pagerQuery) { - BaseGoodsSkuSelectQuery query = pagerQuery.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + public PagerVo getSelectList(PagerQuery pagerQuery) { + GoodsSkuSelectQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if (query != null) { //商品编码 if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { qw.like("sku.goodsSkuCode", query.getGoodsSkuCode()); } } - IPage page = PagerUtil.queryToPage(pagerQuery); - IPage pagging = baseMapper.getSelectList(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.getSelectList(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public ResultBean> purGoodsListPage(PagerQuery pq) { + public ResultBean> purGoodsListPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - BaseGoodsSkuPurSelectQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + GoodsSkuPurSelectQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getOrgSid())){ qw.eq("s.createOrgSid",query.getOrgSid()); } @@ -221,9 +220,9 @@ public class BaseGoodsSkuService extends MybatisBaseService wrapper.like("a.goodsName", query.getOtherQuery()).or().like("s.goodsSkuCode", query.getOtherQuery()).or().like("a.goodsPY",query.getOtherQuery())); } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.purGoodsListPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.purGoodsListPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } } diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuVo.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuVo.java similarity index 84% rename from src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuVo.java rename to src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuVo.java index 92efb31..c71667a 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuVo.java +++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuVo.java @@ -1,8 +1,8 @@ -package com.yxt.goods.biz.base.basegoodssku; +package com.yxt.goods.biz.goodssku; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendVo; +import com.yxt.goods.biz.goodsskuextend.GoodsSkuExtendVo; import com.yxt.common.core.vo.Vo; import lombok.Data; @@ -13,7 +13,7 @@ import java.util.Date; * @date 2024/2/26 13:37 */ @Data -public class BaseGoodsSkuVo implements Vo { +public class GoodsSkuVo implements Vo { private String id; private String sid; private String lockVersion; @@ -33,6 +33,6 @@ public class BaseGoodsSkuVo implements Vo { @TableField(value = "own_spec") private String ownSpec;//sku的特有规格参数键值对，json格式，反序列化时请使用linkedHashMap，保证有序 private String goodsName; - private BaseGoodsSkuExtendVo baseGoodsSkuExtend; + private GoodsSkuExtendVo baseGoodsSkuExtend; } diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuSelectList.java b/src/main/java/com/yxt/goods/biz/goodssku/SkuSelectList.java similarity index 88% rename from src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuSelectList.java rename to src/main/java/com/yxt/goods/biz/goodssku/SkuSelectList.java index c438eba..9a07717 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodssku/BaseGoodsSkuSelectList.java +++ b/src/main/java/com/yxt/goods/biz/goodssku/SkuSelectList.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodssku; +package com.yxt.goods.biz.goodssku; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @date: 2024/3/21 **/ @Data -public class BaseGoodsSkuSelectList { +public class SkuSelectList { //商品名称 private String goodsSpuSid; diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtend.java similarity index 92% rename from src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java rename to src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtend.java index c768b21..df19ff1 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java +++ b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtend.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodsskuextend; +package com.yxt.goods.biz.goodsskuextend; import com.baomidou.mybatisplus.annotation.TableField; import com.yxt.common.core.domain.BaseEntity; @@ -9,7 +9,7 @@ import lombok.Data; * @date 2024/2/26 13:36 */ @Data -public class BaseGoodsSkuExtend extends BaseEntity { +public class GoodsSkuExtend extends BaseEntity { private String goodsSkuSid;//商品Sku代码 private String finalPurchasePrice;//最后采购价 private String safetyStockDays;//安全库存天数 diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtendDto.java b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendDto.java similarity index 94% rename from src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtendDto.java rename to src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendDto.java index 89df34f..ac4533c 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtendDto.java +++ b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendDto.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodsskuextend; +package com.yxt.goods.biz.goodsskuextend; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; @@ -14,7 +14,7 @@ import java.util.List; * @date 2024/2/26 13:38 */ @Data -public class BaseGoodsSkuExtendDto implements Dto { +public class GoodsSkuExtendDto implements Dto { private String id; private String sid; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendMapper.java b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendMapper.java new file mode 100644 index 0000000..85e78bc --- /dev/null +++ b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendMapper.java @@ -0,0 +1,20 @@ +package com.yxt.goods.biz.goodsskuextend; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface GoodsSkuExtendMapper extends BaseMapper { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + GoodsSkuExtendVo getExtendBySkuSid(@Param("skuSid")String skuSid); + GoodsSkuExtendVo getExtendBySid(@Param("sid")String sid); +} diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendMapper.xml similarity index 72% rename from src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml rename to src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendMapper.xml index 41c9db6..7c7b607 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendMapper.xml @@ -1,10 +1,10 @@ - + - select s.*,a.title from base_goods_sku_extend s @@ -13,13 +13,13 @@ ${ew.sqlSegment} - select s.*,s.InventoryAlertUpperLimit as inventoryAlertUpperLimit,s.InventoryAlertLowerLimit as inventoryAlertLowerLimit from base_goods_sku_extend s where s.goodsSkuSid=#{skuSid} - select s.*,s.InventoryAlertUpperLimit as inventoryAlertUpperLimit,s.InventoryAlertLowerLimit as inventoryAlertLowerLimit from base_goods_sku_extend s diff --git a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoQuery.java b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendQuery.java similarity index 60% rename from src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoQuery.java rename to src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendQuery.java index 3f607c4..d7f2697 100644 --- a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendQuery.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basebrandinfo; +package com.yxt.goods.biz.goodsskuextend; import com.yxt.common.core.query.Query; import lombok.Data; @@ -8,6 +8,6 @@ import lombok.Data; * @date 2024/2/26 13:37 */ @Data -public class BaseBrandInfoQuery implements Query { +public class GoodsSkuExtendQuery implements Query { private String name; } diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtendService.java b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendService.java similarity index 66% rename from src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtendService.java rename to src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendService.java index ad39e3b..f630af7 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsskuextend/BaseGoodsSkuExtendService.java +++ b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendService.java @@ -1,16 +1,14 @@ -package com.yxt.goods.biz.base.basegoodsskuextend; +package com.yxt.goods.biz.goodsskuextend; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.goods.biz.base.basebrandinfo.BaseBrandInfoService; -import com.yxt.goods.biz.base.basegoodssku.BaseGoodsSkuDto; -import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpu; -import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpuDto; -import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetailService; -import com.yxt.goods.biz.base.basegoodstype.BaseGoodsTypeService; -import com.yxt.goods.biz.base.basemanufacturer.BaseManufacturerService; +import com.yxt.goods.biz.goodsbrandinfo.GoodsBrandInfoService; +import com.yxt.goods.biz.goodssku.GoodsSkuDto; +import com.yxt.goods.biz.goodsspudetail.BaseGoodsSpuDetailService; +import com.yxt.goods.biz.goodstype.GoodsTypeService; +import com.yxt.goods.biz.goodsmanufacturer.GoodsManufacturerService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -32,29 +30,29 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Service -public class BaseGoodsSkuExtendService extends MybatisBaseService { +public class GoodsSkuExtendService extends MybatisBaseService { @Autowired private FileUploadComponent fileUploadComponent; @Autowired - private BaseBrandInfoService baseBrandInfoService; + private GoodsBrandInfoService baseBrandInfoService; @Autowired - private BaseGoodsTypeService baseGoodsTypeService; + private GoodsTypeService goodsTypeService; @Autowired - private BaseManufacturerService baseManufacturerService; + private GoodsManufacturerService baseManufacturerService; @Autowired BaseGoodsSpuDetailService baseGoodsSpuDetailService; - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - BaseGoodsSkuExtendQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + GoodsSkuExtendQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if(StringUtils.isNotBlank(query.getName())){ qw.like("goodsName",query.getName()); } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); records.removeAll(Collections.singleton(null)); // if (!records.isEmpty()) { // for (BaseGoodsSpuVo record : records) { @@ -66,13 +64,13 @@ public class BaseGoodsSkuExtendService extends MybatisBaseService saveOrUpdate(BaseGoodsSkuExtendDto dto) { + public ResultBean saveOrUpdate(GoodsSkuExtendDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; - BaseGoodsSkuExtend extend=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); + GoodsSkuExtend extend=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); if (null!=extend) { sid = dto.getSid(); - BaseGoodsSkuExtend wmsGoods = fetchBySid(dto.getSid()); + GoodsSkuExtend wmsGoods = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsGoods); wmsGoods.setModifyTime(new Date()); for (UrlsVo url : dto.getUrls()) { @@ -92,7 +90,7 @@ public class BaseGoodsSkuExtendService extends MybatisBaseService skuEBatchSave(List dtos) { + public ResultBean skuEBatchSave(List dtos) { ResultBean rb = ResultBean.fireFail(); - List spus = new ArrayList<>(); - for (BaseGoodsSkuDto dto : dtos) { - BaseGoodsSkuExtend extend = new BaseGoodsSkuExtend(); + List spus = new ArrayList<>(); + for (GoodsSkuDto dto : dtos) { + GoodsSkuExtend extend = new GoodsSkuExtend(); BeanUtil.copyProperties(dto.getBaseGoodsSkuExtend(), extend, "id"); extend.setCreateTime(new DateTime()); spus.add(extend); @@ -127,21 +125,21 @@ public class BaseGoodsSkuExtendService extends MybatisBaseService initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - BaseGoodsSkuExtendVo vo = baseMapper.getExtendBySid(sid); + GoodsSkuExtendVo vo = baseMapper.getExtendBySid(sid); return rb.success().setData(vo); } - public ResultBean getExtendBySkuSid(String sid) { + public ResultBean getExtendBySkuSid(String sid) { ResultBean rb = ResultBean.fireFail(); - BaseGoodsSkuExtendVo vo = baseMapper.getExtendBySkuSid(sid); + GoodsSkuExtendVo vo = baseMapper.getExtendBySkuSid(sid); return rb.success().setData(vo); } public ResultBean delete(String sid) { ResultBean rb = ResultBean.fireFail(); - BaseGoodsSkuExtend wmsGoods = fetchBySid(sid); + GoodsSkuExtend wmsGoods = fetchBySid(sid); if (null != wmsGoods) { baseMapper.deleteById(wmsGoods.getId()); } @@ -150,7 +148,7 @@ public class BaseGoodsSkuExtendService extends MybatisBaseService { +public interface GoodsSpecGroupMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List getSkusBySpuSid(@Param("spuSid")String spuSid); - BaseSpecParamVo getVoBySid(@Param("sid")String sid); + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + List getSkusBySpuSid(@Param("spuSid")String spuSid); + GoodsSpecGroupVo getVoBySid(@Param("sid")String sid); } diff --git a/src/main/java/com/yxt/goods/biz/base/basespecgroup/BaseSpecGroupMapper.xml b/src/main/java/com/yxt/goods/biz/goodsspecgroup/GoodsSpecGroupMapper.xml similarity index 67% rename from src/main/java/com/yxt/goods/biz/base/basespecgroup/BaseSpecGroupMapper.xml rename to src/main/java/com/yxt/goods/biz/goodsspecgroup/GoodsSpecGroupMapper.xml index 9077f7b..af30b4c 100644 --- a/src/main/java/com/yxt/goods/biz/base/basespecgroup/BaseSpecGroupMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsspecgroup/GoodsSpecGroupMapper.xml @@ -1,10 +1,10 @@ - + - select s.*,a.goodsTypeName as categoryName from base_spec_group s left join base_goods_type a on a.sid =s.categroySid @@ -12,13 +12,13 @@ ${ew.sqlSegment} - select s.*, s.own_spec as ownSpec from base_goods_sku s where s.goodsSpuSid = #{spuSid} - select s.*,a.goodsTypeName as categoryName from base_spec_group s left join base_goods_type a on a.sid =s.categroySid diff --git a/src/main/java/com/yxt/goods/biz/base/basespecparam/BaseSpecParamQuery.java b/src/main/java/com/yxt/goods/biz/goodsspecgroup/GoodsSpecGroupQuery.java similarity index 60% rename from src/main/java/com/yxt/goods/biz/base/basespecparam/BaseSpecParamQuery.java rename to src/main/java/com/yxt/goods/biz/goodsspecgroup/GoodsSpecGroupQuery.java index 74f753a..764a874 100644 --- a/src/main/java/com/yxt/goods/biz/base/basespecparam/BaseSpecParamQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodsspecgroup/GoodsSpecGroupQuery.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basespecparam; +package com.yxt.goods.biz.goodsspecgroup; import com.yxt.common.core.query.Query; import lombok.Data; @@ -8,6 +8,6 @@ import lombok.Data; * @date 2024/4/8 9:34 */ @Data -public class BaseSpecParamQuery implements Query { +public class GoodsSpecGroupQuery implements Query { private String name; } diff --git a/src/main/java/com/yxt/goods/biz/base/basespecgroup/BaseSpecGroupService.java b/src/main/java/com/yxt/goods/biz/goodsspecgroup/GoodsSpecGroupService.java similarity index 66% rename from src/main/java/com/yxt/goods/biz/base/basespecgroup/BaseSpecGroupService.java rename to src/main/java/com/yxt/goods/biz/goodsspecgroup/GoodsSpecGroupService.java index 3e9a0d1..72272c5 100644 --- a/src/main/java/com/yxt/goods/biz/base/basespecgroup/BaseSpecGroupService.java +++ b/src/main/java/com/yxt/goods/biz/goodsspecgroup/GoodsSpecGroupService.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basespecgroup; +package com.yxt.goods.biz.goodsspecgroup; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; @@ -23,35 +23,35 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Service -public class BaseSpecGroupService extends MybatisBaseService { +public class GoodsSpecGroupService extends MybatisBaseService { @Autowired private FileUploadComponent fileUploadComponent; - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - BaseSpecGroupQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + GoodsSpecGroupQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getName())) { qw.like("goodsName", query.getName()); } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } @Transactional - public ResultBean saveOrUpdate(BaseSpecGroupDto dto) { + public ResultBean saveOrUpdate(GoodsSpecGroupDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); - BaseSpecGroup wmsGoods = fetchBySid(dto.getSid()); + GoodsSpecGroup wmsGoods = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); wmsGoods.setModifyTime(new Date()); baseMapper.updateById(wmsGoods); } else { - BaseSpecGroup wmsGoods = new BaseSpecGroup(); + GoodsSpecGroup wmsGoods = new GoodsSpecGroup(); BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); wmsGoods.setCreateTime(new DateTime()); baseMapper.insert(wmsGoods); @@ -59,19 +59,19 @@ public class BaseSpecGroupService extends MybatisBaseService saveOrUpdate(List dtos) { + public ResultBean saveOrUpdate(List dtos) { ResultBean rb = ResultBean.fireFail(); - for (BaseSpecGroupDto dto : dtos) { - BaseSpecGroup sku=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); + for (GoodsSpecGroupDto dto : dtos) { + GoodsSpecGroup sku=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); String sid = ""; if (null!=sku) { sid = dto.getSid(); - BaseSpecGroup wmsGoods = fetchBySid(dto.getSid()); + GoodsSpecGroup wmsGoods = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsGoods); wmsGoods.setModifyTime(new Date()); baseMapper.updateById(wmsGoods); } else { - BaseSpecGroup wmsGoods = new BaseSpecGroup(); + GoodsSpecGroup wmsGoods = new GoodsSpecGroup(); BeanUtil.copyProperties(dto, wmsGoods); wmsGoods.setCreateTime(new DateTime()); baseMapper.insert(wmsGoods); @@ -81,22 +81,22 @@ public class BaseSpecGroupService extends MybatisBaseService initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - BaseSpecGroupVo vo = baseMapper.getVoBySid(sid); + GoodsSpecGroupVo vo = baseMapper.getVoBySid(sid); return rb.success().setData(vo); } - public ResultBean> getSkusBySpuSid(String sid) { + public ResultBean> getSkusBySpuSid(String sid) { ResultBean rb = ResultBean.fireFail(); - List vo = baseMapper.getSkusBySpuSid(sid); + List vo = baseMapper.getSkusBySpuSid(sid); return rb.success().setData(vo); } public ResultBean delete(String sid) { ResultBean rb = ResultBean.fireFail(); - BaseSpecGroup wmsGoods = fetchBySid(sid); + GoodsSpecGroup wmsGoods = fetchBySid(sid); if (null != wmsGoods) { baseMapper.deleteById(wmsGoods.getId()); } @@ -105,7 +105,7 @@ public class BaseSpecGroupService extends MybatisBaseService { +public interface GoodsSpecParamMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List getSkusBySpuSid(@Param("spuSid")String spuSid); - BaseSpecGroupVo getVoBySid(@Param("sid")String sid); + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + List getSkusBySpuSid(@Param("spuSid")String spuSid); + GoodsSpecParamVo getVoBySid(@Param("sid")String sid); } diff --git a/src/main/java/com/yxt/goods/biz/base/basespecparam/BaseSpecParamMapper.xml b/src/main/java/com/yxt/goods/biz/goodsspecparam/GoodsSpecParamMapper.xml similarity index 71% rename from src/main/java/com/yxt/goods/biz/base/basespecparam/BaseSpecParamMapper.xml rename to src/main/java/com/yxt/goods/biz/goodsspecparam/GoodsSpecParamMapper.xml index a9b51e8..5114e12 100644 --- a/src/main/java/com/yxt/goods/biz/base/basespecparam/BaseSpecParamMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsspecparam/GoodsSpecParamMapper.xml @@ -1,10 +1,10 @@ - + - select s.*,a.groupName,b.goodsTypeName as categoryName from base_spec_param s left join base_spec_group a on a.sid=s.groupSid @@ -13,13 +13,13 @@ ${ew.sqlSegment} - select s.*, s.own_spec as ownSpec from base_goods_sku s where s.goodsSpuSid = #{spuSid} - select s.*,a.groupName,b.goodsTypeName as categoryName from base_spec_param s left join base_spec_group a on a.sid=s.groupSid diff --git a/src/main/java/com/yxt/goods/biz/base/basespecgroup/BaseSpecGroupQuery.java b/src/main/java/com/yxt/goods/biz/goodsspecparam/GoodsSpecParamQuery.java similarity index 60% rename from src/main/java/com/yxt/goods/biz/base/basespecgroup/BaseSpecGroupQuery.java rename to src/main/java/com/yxt/goods/biz/goodsspecparam/GoodsSpecParamQuery.java index 39c0bb1..2e1d073 100644 --- a/src/main/java/com/yxt/goods/biz/base/basespecgroup/BaseSpecGroupQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodsspecparam/GoodsSpecParamQuery.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basespecgroup; +package com.yxt.goods.biz.goodsspecparam; import com.yxt.common.core.query.Query; import lombok.Data; @@ -8,6 +8,6 @@ import lombok.Data; * @date 2024/4/8 9:34 */ @Data -public class BaseSpecGroupQuery implements Query { +public class GoodsSpecParamQuery implements Query { private String name; } diff --git a/src/main/java/com/yxt/goods/biz/base/basespecparam/BaseSpecParamService.java b/src/main/java/com/yxt/goods/biz/goodsspecparam/GoodsSpecParamService.java similarity index 66% rename from src/main/java/com/yxt/goods/biz/base/basespecparam/BaseSpecParamService.java rename to src/main/java/com/yxt/goods/biz/goodsspecparam/GoodsSpecParamService.java index da1b926..7749002 100644 --- a/src/main/java/com/yxt/goods/biz/base/basespecparam/BaseSpecParamService.java +++ b/src/main/java/com/yxt/goods/biz/goodsspecparam/GoodsSpecParamService.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basespecparam; +package com.yxt.goods.biz.goodsspecparam; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; @@ -23,35 +23,35 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Service -public class BaseSpecParamService extends MybatisBaseService { +public class GoodsSpecParamService extends MybatisBaseService { @Autowired private FileUploadComponent fileUploadComponent; - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - BaseSpecParamQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + GoodsSpecParamQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getName())) { qw.like("goodsName", query.getName()); } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } @Transactional - public ResultBean saveOrUpdate(BaseSpecParamDto dto) { + public ResultBean saveOrUpdate(GoodsSpecParamDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); - BaseSpecParam wmsGoods = fetchBySid(dto.getSid()); + GoodsSpecParam wmsGoods = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsGoods); wmsGoods.setModifyTime(new Date()); baseMapper.updateById(wmsGoods); } else { - BaseSpecParam wmsGoods = new BaseSpecParam(); + GoodsSpecParam wmsGoods = new GoodsSpecParam(); BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); wmsGoods.setCreateTime(new DateTime()); baseMapper.insert(wmsGoods); @@ -61,19 +61,19 @@ public class BaseSpecParamService extends MybatisBaseService saveOrUpdate(List dtos) { + public ResultBean saveOrUpdate(List dtos) { ResultBean rb = ResultBean.fireFail(); - for (BaseSpecParamDto dto : dtos) { - BaseSpecParam sku=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); + for (GoodsSpecParamDto dto : dtos) { + GoodsSpecParam sku=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); String sid = ""; if (null!=sku) { sid = dto.getSid(); - BaseSpecParam wmsGoods = fetchBySid(dto.getSid()); + GoodsSpecParam wmsGoods = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsGoods); wmsGoods.setModifyTime(new Date()); baseMapper.updateById(wmsGoods); } else { - BaseSpecParam wmsGoods = new BaseSpecParam(); + GoodsSpecParam wmsGoods = new GoodsSpecParam(); BeanUtil.copyProperties(dto, wmsGoods); wmsGoods.setCreateTime(new DateTime()); baseMapper.insert(wmsGoods); @@ -83,22 +83,22 @@ public class BaseSpecParamService extends MybatisBaseService initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - BaseSpecParamVo vo = baseMapper.getVoBySid(sid); + GoodsSpecParamVo vo = baseMapper.getVoBySid(sid); return rb.success().setData(vo); } - public ResultBean> getSkusBySpuSid(String sid) { + public ResultBean> getSkusBySpuSid(String sid) { ResultBean rb = ResultBean.fireFail(); - List vo = baseMapper.getSkusBySpuSid(sid); + List vo = baseMapper.getSkusBySpuSid(sid); return rb.success().setData(vo); } public ResultBean delete(String sid) { ResultBean rb = ResultBean.fireFail(); - BaseSpecParam wmsGoods = fetchBySid(sid); + GoodsSpecParam wmsGoods = fetchBySid(sid); if (null != wmsGoods) { baseMapper.deleteById(wmsGoods.getId()); } @@ -107,7 +107,7 @@ public class BaseSpecParamService extends MybatisBaseService baseGoodsSkus;//商品sku + private GoodsSpuDetailDto baseGoodsSpuDetail;//商品spu详情 + private List baseGoodsSkus;//商品sku } diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsspu/BaseGoodsSpuMapper.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.java similarity index 56% rename from src/main/java/com/yxt/goods/biz/base/basegoodsspu/BaseGoodsSpuMapper.java rename to src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.java index 24f7a44..50bb0f7 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsspu/BaseGoodsSpuMapper.java +++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodsspu; +package com.yxt.goods.biz.goodsspu; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -12,8 +12,8 @@ import org.apache.ibatis.annotations.Param; * @date 2024/2/26 13:40 */ @Mapper -public interface BaseGoodsSpuMapper extends BaseMapper { +public interface GoodsSpuMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - BaseGoodsSpuVo initialization(@Param("sid")String sid); + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + GoodsSpuVo initialization(@Param("sid")String sid); } diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml similarity index 78% rename from src/main/java/com/yxt/goods/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml rename to src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml index 3f59686..5806988 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml @@ -1,10 +1,10 @@ - + - select s.*,a.goodsTypeName as typeName,b.brandName as brandName,c.manufacturerName as manufacturerName from base_goods_spu s @@ -15,7 +15,7 @@ ${ew.sqlSegment} - select s.*,a.goodsTypeName as typeName,b.brandName as brandName,c.manufacturerName as manufacturerName from base_goods_spu s diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeQuery.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java similarity index 60% rename from src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeQuery.java rename to src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java index fa45143..ae86e1d 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodstype; +package com.yxt.goods.biz.goodsspu; import com.yxt.common.core.query.Query; import lombok.Data; @@ -8,6 +8,6 @@ import lombok.Data; * @date 2024/2/26 13:37 */ @Data -public class BaseGoodsTypeQuery implements Query { +public class GoodsSpuQuery implements Query { private String name; } diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsspu/BaseGoodsSpuService.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java similarity index 65% rename from src/main/java/com/yxt/goods/biz/base/basegoodsspu/BaseGoodsSpuService.java rename to src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java index b1f8d26..d0d62c0 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsspu/BaseGoodsSpuService.java +++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java @@ -1,29 +1,29 @@ -package com.yxt.goods.biz.base.basegoodsspu; +package com.yxt.goods.biz.goodsspu; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.goods.apiadmin.base.BaseGoodsBrandRest; -import com.yxt.goods.biz.base.basebrandinfo.BaseBrandInfo; -import com.yxt.goods.biz.base.basebrandinfo.BaseBrandInfoService; -import com.yxt.goods.biz.base.basegoodssku.BaseGoodsSku; -import com.yxt.goods.biz.base.basegoodssku.BaseGoodsSkuDto; -import com.yxt.goods.biz.base.basegoodssku.BaseGoodsSkuService; -import com.yxt.goods.biz.base.basegoodssku.BaseGoodsSkuVo; -import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendDto; -import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendService; -import com.yxt.goods.biz.base.basegoodsskuextend.BaseGoodsSkuExtendVo; -import com.yxt.goods.biz.base.basegoodsskuextend.UrlsVo; -import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetailDto; -import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetailService; -import com.yxt.goods.biz.base.basegoodsspudetail.BaseGoodsSpuDetailVo; -import com.yxt.goods.biz.base.basegoodstype.BaseGoodsType; -import com.yxt.goods.biz.base.basegoodstype.BaseGoodsTypeService; -import com.yxt.goods.biz.base.basegoodsunit.BaseGoodsUnit; -import com.yxt.goods.biz.base.basegoodsunit.BaseGoodsUnitService; -import com.yxt.goods.biz.base.basemanufacturer.BaseManufacturer; -import com.yxt.goods.biz.base.basemanufacturer.BaseManufacturerService; +import com.yxt.goods.apiadmin.GoodsBrandRest; +import com.yxt.goods.biz.goodsbrandinfo.GoodsBrandInfo; +import com.yxt.goods.biz.goodsbrandinfo.GoodsBrandInfoService; +import com.yxt.goods.biz.goodssku.GoodsSku; +import com.yxt.goods.biz.goodssku.GoodsSkuDto; +import com.yxt.goods.biz.goodssku.GoodsSkuService; +import com.yxt.goods.biz.goodssku.GoodsSkuVo; +import com.yxt.goods.biz.goodsskuextend.GoodsSkuExtendDto; +import com.yxt.goods.biz.goodsskuextend.GoodsSkuExtendService; +import com.yxt.goods.biz.goodsskuextend.GoodsSkuExtendVo; +import com.yxt.goods.biz.goodsskuextend.UrlsVo; +import com.yxt.goods.biz.goodsspudetail.GoodsSpuDetailDto; +import com.yxt.goods.biz.goodsspudetail.BaseGoodsSpuDetailService; +import com.yxt.goods.biz.goodsspudetail.BaseGoodsSpuDetailVo; +import com.yxt.goods.biz.goodstype.GoodsType; +import com.yxt.goods.biz.goodstype.GoodsTypeService; +import com.yxt.goods.biz.goodsunit.GoodsUnit; +import com.yxt.goods.biz.goodsunit.GoodsUnitService; +import com.yxt.goods.biz.goodsmanufacturer.GoodsManufacturer; +import com.yxt.goods.biz.goodsmanufacturer.GoodsManufacturerService; import com.yxt.goods.utils.ExcelUtil; import com.yxt.goods.utils.PinYinUtils; import com.yxt.common.base.config.component.FileUploadComponent; @@ -50,36 +50,36 @@ import java.util.stream.Collectors; * @date 2024/2/26 13:40 */ @Service -public class BaseGoodsSpuService extends MybatisBaseService { +public class GoodsSpuService extends MybatisBaseService { @Autowired private FileUploadComponent fileUploadComponent; @Autowired BaseGoodsSpuDetailService baseGoodsSpuDetailService; @Autowired - BaseGoodsSkuService baseGoodsSkuService; + GoodsSkuService goodsSkuService; @Autowired - BaseGoodsUnitService baseGoodsUnitService; + GoodsUnitService goodsUnitService; @Autowired - BaseGoodsSkuExtendService baseGoodsSkuExtendService; + GoodsSkuExtendService goodsSkuExtendService; @Autowired - BaseManufacturerService baseManufacturerService; + GoodsManufacturerService baseManufacturerService; @Autowired - BaseGoodsTypeService baseGoodsTypeService; + GoodsTypeService goodsTypeService; @Autowired - BaseBrandInfoService baseBrandInfoService; + GoodsBrandInfoService baseBrandInfoService; - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - BaseGoodsSpuQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + GoodsSpuQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getName())) { qw.like("goodsName", query.getName()); } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); records.removeAll(Collections.singleton(null)); // if (!records.isEmpty()) { // for (BaseGoodsSpuVo record : records) { @@ -92,13 +92,13 @@ public class BaseGoodsSpuService extends MybatisBaseService saveOrUpdate(BaseGoodsSpuDto dto) { + public ResultBean saveOrUpdate(GoodsSpuDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; - BaseGoodsSpu spun = baseMapper.selectOne(new QueryWrapper().eq("sid", dto.getSid())); - BaseGoodsUnit baseGoodsUnit = baseGoodsUnitService.getOne(new QueryWrapper().eq("sid", dto.getGoodsUnitSid())); - if (null != baseGoodsUnit) { - dto.setGoodsUnitName(baseGoodsUnit.getUnitName()); + GoodsSpu spun = baseMapper.selectOne(new QueryWrapper().eq("sid", dto.getSid())); + GoodsUnit goodsUnit = goodsUnitService.getOne(new QueryWrapper().eq("sid", dto.getGoodsUnitSid())); + if (null != goodsUnit) { + dto.setGoodsUnitName(goodsUnit.getUnitName()); } if (spun != null) { @@ -106,7 +106,7 @@ public class BaseGoodsSpuService extends MybatisBaseService { s.setGoodsSpuSid(wmsGoods.getSid()); }); - baseGoodsSkuService.saveOrUpdate(dto.getBaseGoodsSkus()); + goodsSkuService.saveOrUpdate(dto.getBaseGoodsSkus()); } else { - BaseGoodsSpu spu = baseMapper.selectOne(new QueryWrapper().eq("goodsCode", dto.getGoodsCode())); + GoodsSpu spu = baseMapper.selectOne(new QueryWrapper().eq("goodsCode", dto.getGoodsCode())); if (spu != null) { return rb.setMsg("商品编码重复"); } - BaseGoodsSpu wmsGoods = new BaseGoodsSpu(); + GoodsSpu wmsGoods = new GoodsSpu(); sid = wmsGoods.getSid(); BeanUtil.copyProperties(dto, wmsGoods); wmsGoods.setCreateTime(new DateTime()); @@ -137,18 +137,18 @@ public class BaseGoodsSpuService extends MybatisBaseService { s.setGoodsSpuSid(wmsGoods.getSid()); }); - baseGoodsSkuService.saveOrUpdate(dto.getBaseGoodsSkus()); + goodsSkuService.saveOrUpdate(dto.getBaseGoodsSkus()); } return rb.success().setMsg("成功"); } @Transactional - public ResultBean batchSave(List dtos) { + public ResultBean batchSave(List dtos) { ResultBean rb = ResultBean.fireFail(); - List spus = new ArrayList<>(); - List skus=new ArrayList<>(); - for (BaseGoodsSpuDto dto : dtos) { - BaseGoodsSpu wmsGoods = new BaseGoodsSpu(); + List spus = new ArrayList<>(); + List skus=new ArrayList<>(); + for (GoodsSpuDto dto : dtos) { + GoodsSpu wmsGoods = new GoodsSpu(); BeanUtil.copyProperties(dto, wmsGoods, "id"); wmsGoods.setCreateTime(new DateTime()); // skus.addAll(dto.getBaseGoodsSkus()); @@ -156,19 +156,19 @@ public class BaseGoodsSpuService extends MybatisBaseService initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - BaseGoodsSpuVo vo = baseMapper.initialization(sid); + GoodsSpuVo vo = baseMapper.initialization(sid); BaseGoodsSpuDetailVo vo1 = baseGoodsSpuDetailService.getSpuDetailsBySpuSid(vo.getSid()).getData(); vo.setBaseGoodsSpuDetail(vo1); - List vos = baseGoodsSkuService.getSkusBySpuSid(vo.getSid()).getData(); - for (BaseGoodsSkuVo baseGoodsSkuVo : vos) { + List vos = goodsSkuService.getSkusBySpuSid(vo.getSid()).getData(); + for (GoodsSkuVo goodsSkuVo : vos) { List ur = new ArrayList<>(); - BaseGoodsSkuExtendVo vo2 = baseGoodsSkuExtendService.getExtendBySkuSid(baseGoodsSkuVo.getSid()).getData(); + GoodsSkuExtendVo vo2 = goodsSkuExtendService.getExtendBySkuSid(goodsSkuVo.getSid()).getData(); if (StringUtils.isNotBlank(vo2.getPicUrl())) { for (String url : vo2.getPicUrl().split(",")) { url = fileUploadComponent.getUrlPrefix() + url; @@ -178,7 +178,7 @@ public class BaseGoodsSpuService extends MybatisBaseService list = ExcelUtil.readExcel(file); if (!list.isEmpty()) { List tt = new ArrayList(); - List tt1 = new ArrayList(); + List tt1 = new ArrayList(); for (int i = 0; i < list.size(); i++) { - BaseGoodsSpuDto dto =new BaseGoodsSpuDto(); + GoodsSpuDto dto =new GoodsSpuDto(); System.out.println(list.get(i)); dto = this.packaging(list.get(i),dto); if (null == dto) { @@ -223,42 +223,42 @@ public class BaseGoodsSpuService extends MybatisBaseService a(List dtos) { + public List a(List dtos) { ResultBean rb=new ResultBean().fail(); - List spus = new ArrayList<>();//spu list - spus = dtos.stream().filter(distinctByKey(BaseGoodsSpuDto::getGoodsCode)).collect(Collectors.toList()); - for (BaseGoodsSpuDto baseGoodsSpuDto : spus) { + List spus = new ArrayList<>();//spu list + spus = dtos.stream().filter(distinctByKey(GoodsSpuDto::getGoodsCode)).collect(Collectors.toList()); + for (GoodsSpuDto goodsSpuDto : spus) { - BaseGoodsSpuDetailDto spuDetail = new BaseGoodsSpuDetailDto(); - List skus = new ArrayList<>(); + GoodsSpuDetailDto spuDetail = new GoodsSpuDetailDto(); + List skus = new ArrayList<>(); String sid = UUID.randomUUID().toString(); - baseGoodsSpuDto.setSid(sid); - List dtos1 = dtos.stream().filter(d -> d.getGoodsCode().equals(baseGoodsSpuDto.getGoodsCode())).collect(Collectors.toList()); + goodsSpuDto.setSid(sid); + List dtos1 = dtos.stream().filter(d -> d.getGoodsCode().equals(goodsSpuDto.getGoodsCode())).collect(Collectors.toList()); spuDetail.setGoodsExplain(dtos1.get(0).getBaseGoodsSpuDetail().getGoodsExplain()); spuDetail.setGoodsDescription(dtos1.get(0).getBaseGoodsSpuDetail().getGoodsDescription()); spuDetail.setSid(UUID.randomUUID().toString()); - spuDetail.setGoodSpuSid(baseGoodsSpuDto.getSid()); - for (BaseGoodsSpuDto dto : dtos1) { - BaseGoodsSkuDto sku = new BaseGoodsSkuDto(); + spuDetail.setGoodSpuSid(goodsSpuDto.getSid()); + for (GoodsSpuDto dto : dtos1) { + GoodsSkuDto sku = new GoodsSkuDto(); String skuSid = UUID.randomUUID().toString(); sku.setGoodsSkuCode(dto.getBaseGoodsSkus().get(0).getGoodsSkuCode()); sku.setTitle(dto.getBaseGoodsSkus().get(0).getTitle()); sku.setExternalCode(dto.getBaseGoodsSkus().get(0).getExternalCode()); sku.setGoodsSpuSid(sid); sku.setSid(skuSid); - BaseGoodsSkuExtendDto skuExtend = new BaseGoodsSkuExtendDto(); + GoodsSkuExtendDto skuExtend = new GoodsSkuExtendDto(); skuExtend.setSid(UUID.randomUUID().toString()); skuExtend.setGoodsSkuSid(skuSid); skuExtend.setSortNo("1"); @@ -318,8 +318,8 @@ public class BaseGoodsSpuService extends MybatisBaseService seen.add(keyExtractor.apply(t)); } - private BaseGoodsSpuDto packaging(String[] arr, BaseGoodsSpuDto baseGoodsSpuDto) { + private GoodsSpuDto packaging(String[] arr, GoodsSpuDto goodsSpuDto) { Map result = new HashMap<>(); //0四电名称1四电类别2规格3数量4单价5总价6单位7备注 // BaseGoodsSpuDto baseGoodsSpuDto =null; @@ -382,37 +382,37 @@ public class BaseGoodsSpuService extends MybatisBaseService dtos=new ArrayList<>(); - BaseGoodsSkuDto dto1=new BaseGoodsSkuDto(); + goodsSpuDto.setBaseGoodsSpuDetail(dto); + List dtos=new ArrayList<>(); + GoodsSkuDto dto1=new GoodsSkuDto(); dto1.setGoodsSkuCode(goodsSkuCode); dto1.setTitle(title); dto1.setExternalCode(skuExternalCode); - BaseGoodsSkuExtendDto dto2=new BaseGoodsSkuExtendDto(); + GoodsSkuExtendDto dto2=new GoodsSkuExtendDto(); dto2.setSortNo("1"); dto2.setFinalPurchasePrice(finalPurchasePrice); dto2.setSafetyStockDays(safetyStockDays); @@ -432,12 +432,12 @@ public class BaseGoodsSpuService extends MybatisBaseService baseGoodsSkus; + private List baseGoodsSkus; } diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsspudetail/BaseGoodsSpuDetailQuery.java b/src/main/java/com/yxt/goods/biz/goodsspudetail/BaseGoodsSpuDetailQuery.java similarity index 80% rename from src/main/java/com/yxt/goods/biz/base/basegoodsspudetail/BaseGoodsSpuDetailQuery.java rename to src/main/java/com/yxt/goods/biz/goodsspudetail/BaseGoodsSpuDetailQuery.java index 5b3f188..5047c2a 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsspudetail/BaseGoodsSpuDetailQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodsspudetail/BaseGoodsSpuDetailQuery.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodsspudetail; +package com.yxt.goods.biz.goodsspudetail; import com.yxt.common.core.query.Query; import lombok.Data; diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsspudetail/BaseGoodsSpuDetailService.java b/src/main/java/com/yxt/goods/biz/goodsspudetail/BaseGoodsSpuDetailService.java similarity index 60% rename from src/main/java/com/yxt/goods/biz/base/basegoodsspudetail/BaseGoodsSpuDetailService.java rename to src/main/java/com/yxt/goods/biz/goodsspudetail/BaseGoodsSpuDetailService.java index fbd3035..5df4956 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsspudetail/BaseGoodsSpuDetailService.java +++ b/src/main/java/com/yxt/goods/biz/goodsspudetail/BaseGoodsSpuDetailService.java @@ -1,14 +1,13 @@ -package com.yxt.goods.biz.base.basegoodsspudetail; +package com.yxt.goods.biz.goodsspudetail; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.goods.biz.base.basebrandinfo.BaseBrandInfoService; -import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpu; -import com.yxt.goods.biz.base.basegoodsspu.BaseGoodsSpuDto; -import com.yxt.goods.biz.base.basegoodstype.BaseGoodsTypeService; -import com.yxt.goods.biz.base.basemanufacturer.BaseManufacturerService; +import com.yxt.goods.biz.goodsbrandinfo.GoodsBrandInfoService; +import com.yxt.goods.biz.goodsspu.GoodsSpuDto; +import com.yxt.goods.biz.goodstype.GoodsTypeService; +import com.yxt.goods.biz.goodsmanufacturer.GoodsManufacturerService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -30,55 +29,55 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Service -public class BaseGoodsSpuDetailService extends MybatisBaseService { +public class BaseGoodsSpuDetailService extends MybatisBaseService { @Autowired private FileUploadComponent fileUploadComponent; @Autowired - private BaseBrandInfoService baseBrandInfoService; + private GoodsBrandInfoService baseBrandInfoService; @Autowired - private BaseGoodsTypeService baseGoodsTypeService; + private GoodsTypeService goodsTypeService; @Autowired - private BaseManufacturerService wmsManufacturerService; + private GoodsManufacturerService wmsManufacturerService; public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); BaseGoodsSpuDetailQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + QueryWrapper qw = new QueryWrapper<>(); if(StringUtils.isNotBlank(query.getName())){ qw.like("goodsName",query.getName()); } - IPage page = PagerUtil.queryToPage(pq); + IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } - public ResultBean saveOrUpdate(BaseGoodsSpuDetailDto dto) { + public ResultBean saveOrUpdate(GoodsSpuDetailDto dto) { ResultBean rb = ResultBean.fireFail(); - BaseGoodsSpuDetail detail=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); + GoodsSpuDetail detail=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); String sid = ""; if (null!=detail) { sid = dto.getSid(); - BaseGoodsSpuDetail baseGoodsSpuDetail = fetchBySid(dto.getSid()); - BeanUtil.copyProperties(dto, baseGoodsSpuDetail); - baseGoodsSpuDetail.setModifyTime(new Date()); - baseMapper.updateById(baseGoodsSpuDetail); + GoodsSpuDetail goodsSpuDetail = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, goodsSpuDetail); + goodsSpuDetail.setModifyTime(new Date()); + baseMapper.updateById(goodsSpuDetail); } else { - BaseGoodsSpuDetail baseGoodsSpuDetail = new BaseGoodsSpuDetail(); - sid = baseGoodsSpuDetail.getSid(); - BeanUtil.copyProperties(dto, baseGoodsSpuDetail); - baseGoodsSpuDetail.setCreateTime(new DateTime()); + GoodsSpuDetail goodsSpuDetail = new GoodsSpuDetail(); + sid = goodsSpuDetail.getSid(); + BeanUtil.copyProperties(dto, goodsSpuDetail); + goodsSpuDetail.setCreateTime(new DateTime()); - baseMapper.insert(baseGoodsSpuDetail); + baseMapper.insert(goodsSpuDetail); } return rb.success().setMsg("成功"); } @Transactional - public ResultBean batchSave(List dtos) { + public ResultBean batchSave(List dtos) { ResultBean rb = ResultBean.fireFail(); - List spus = new ArrayList<>(); - for (BaseGoodsSpuDto dto : dtos) { - BaseGoodsSpuDetail detail = new BaseGoodsSpuDetail(); + List spus = new ArrayList<>(); + for (GoodsSpuDto dto : dtos) { + GoodsSpuDetail detail = new GoodsSpuDetail(); BeanUtil.copyProperties(dto.getBaseGoodsSpuDetail(), detail, "id"); detail.setCreateTime(new DateTime()); spus.add(detail); @@ -89,20 +88,20 @@ public class BaseGoodsSpuDetailService extends MybatisBaseService initialization(String sid) { ResultBean rb = ResultBean.fireFail(); BaseGoodsSpuDetailVo vo = new BaseGoodsSpuDetailVo(); - BaseGoodsSpuDetail wmsGoods = fetchBySid(sid); + GoodsSpuDetail wmsGoods = fetchBySid(sid); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); BeanUtil.copyProperties(wmsGoods, vo); return rb.success().setData(vo); } - public ResultBean importSave(BaseGoodsSpuDetailDto dto) { + public ResultBean importSave(GoodsSpuDetailDto dto) { ResultBean rb = ResultBean.fireFail(); // BaseGoodsSpuDetail detail=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); String sid = ""; - BaseGoodsSpuDetail baseGoodsSpuDetail = new BaseGoodsSpuDetail(); - sid = baseGoodsSpuDetail.getSid(); - BeanUtil.copyProperties(dto, baseGoodsSpuDetail,"id","sid"); - baseGoodsSpuDetail.setCreateTime(new DateTime()); - baseMapper.insert(baseGoodsSpuDetail); + GoodsSpuDetail goodsSpuDetail = new GoodsSpuDetail(); + sid = goodsSpuDetail.getSid(); + BeanUtil.copyProperties(dto, goodsSpuDetail,"id","sid"); + goodsSpuDetail.setCreateTime(new DateTime()); + baseMapper.insert(goodsSpuDetail); return rb.success().setMsg("成功"); } @@ -115,7 +114,7 @@ public class BaseGoodsSpuDetailService extends MybatisBaseService { +public interface GoodsSpuDetailMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); BaseGoodsSpuDetailVo getSpuDetailsBySpuSid (@Param("skuSid")String skuSid); } diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml b/src/main/java/com/yxt/goods/biz/goodsspudetail/GoodsSpuDetailMapper.xml similarity index 73% rename from src/main/java/com/yxt/goods/biz/base/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml rename to src/main/java/com/yxt/goods/biz/goodsspudetail/GoodsSpuDetailMapper.xml index 69b2042..07bca17 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsspudetail/GoodsSpuDetailMapper.xml @@ -1,10 +1,10 @@ - + - select s.*,a.goodsName from base_goods_spu_detail s @@ -14,7 +14,7 @@ ${ew.sqlSegment} - select s.*,s.generic_spec as genericSpec,s.special_spec as specialSpec from base_goods_spu_detail s diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsType.java b/src/main/java/com/yxt/goods/biz/goodstype/GoodsType.java similarity index 87% rename from src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsType.java rename to src/main/java/com/yxt/goods/biz/goodstype/GoodsType.java index 301f73e..b6bde09 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsType.java +++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsType.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodstype; +package com.yxt.goods.biz.goodstype; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @date 2024/2/26 13:36 */ @Data -public class BaseGoodsType extends BaseEntity { +public class GoodsType extends BaseEntity { private String goodsTypeName;//商品类别名称 private String goodsTypeCode;//类别编码 private String percentageRate;//提成比例 diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeDto.java b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeDto.java similarity index 91% rename from src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeDto.java rename to src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeDto.java index efcd862..77dab62 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeDto.java +++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeDto.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodstype; +package com.yxt.goods.biz.goodstype; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; @@ -11,7 +11,7 @@ import java.util.Date; * @date 2024/2/26 13:38 */ @Data -public class BaseGoodsTypeDto implements Dto { +public class GoodsTypeDto implements Dto { private String id; private String sid; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoMapper.java b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.java similarity index 61% rename from src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoMapper.java rename to src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.java index 37330ac..4dbe82e 100644 --- a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoMapper.java +++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basebrandinfo; +package com.yxt.goods.biz.goodstype; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -12,7 +12,6 @@ import org.apache.ibatis.annotations.Param; * @date 2024/2/26 13:40 */ @Mapper -public interface BaseBrandInfoMapper extends BaseMapper { - - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +public interface GoodsTypeMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeMapper.xml b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml similarity index 67% rename from src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeMapper.xml rename to src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml index 8cf55d1..5ad69c9 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml @@ -1,10 +1,10 @@ - + - select * from base_goods_type diff --git a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeQuery.java b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeQuery.java new file mode 100644 index 0000000..e24cb38 --- /dev/null +++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeQuery.java @@ -0,0 +1,13 @@ +package com.yxt.goods.biz.goodstype; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class GoodsTypeQuery implements Query { + private String name; +} diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeService.java b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java similarity index 67% rename from src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeService.java rename to src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java index 712edae..5477ea3 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeService.java +++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodstype; +package com.yxt.goods.biz.goodstype; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; @@ -21,42 +21,42 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Service -public class BaseGoodsTypeService extends MybatisBaseService { +public class GoodsTypeService extends MybatisBaseService { - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - BaseGoodsTypeQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + GoodsTypeQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if(StringUtils.isNotBlank(query.getName())){ qw.like("goodsTypeName",query.getName()); } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); - for (BaseGoodsTypeVo record : records) { + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + for (GoodsTypeVo record : records) { if(StringUtils.isNotBlank(record.getPSid())){ - BaseGoodsType wmsGoodsType1 = fetchBySid(record.getPSid()); + GoodsType wmsGoodsType1 = fetchBySid(record.getPSid()); record.setPName(wmsGoodsType1.getGoodsTypeName()); record.setSids(record.getPSid()); } } return rb.success().setData(p); - } public ResultBean> listAll() { + } public ResultBean> listAll() { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); return rb.success().setData(pagging); } - public ResultBean saveOrUpdate(BaseGoodsTypeDto dto) { + public ResultBean saveOrUpdate(GoodsTypeDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; dto.setPSid(dto.getSids()); if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); - BaseGoodsType wmsGoodsType = fetchBySid(dto.getSid()); + GoodsType wmsGoodsType = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsGoodsType, "id", "sid"); wmsGoodsType.setModifyTime(new Date()); wmsGoodsType.setIsParent("0"); @@ -65,7 +65,7 @@ public class BaseGoodsTypeService extends MybatisBaseService initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - BaseGoodsTypeVo vo = new BaseGoodsTypeVo(); - BaseGoodsType wmsGoodsType = fetchBySid(sid); + GoodsTypeVo vo = new GoodsTypeVo(); + GoodsType wmsGoodsType = fetchBySid(sid); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (null != wmsGoodsType) { BeanUtil.copyProperties(wmsGoodsType, vo); @@ -90,7 +90,7 @@ public class BaseGoodsTypeService extends MybatisBaseService getTypeByName(String name) { + public ResultBean getTypeByName(String name) { ResultBean rb = ResultBean.fireFail(); - BaseGoodsType type=baseMapper.selectOne(new QueryWrapper().eq("goodsTypeName",name)); + GoodsType type=baseMapper.selectOne(new QueryWrapper().eq("goodsTypeName",name)); return rb.success().setData(type); } diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeVo.java b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeVo.java similarity index 92% rename from src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeVo.java rename to src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeVo.java index 08d9644..b8623b6 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeVo.java +++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeVo.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodstype; +package com.yxt.goods.biz.goodstype; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; @@ -11,7 +11,7 @@ import java.util.Date; * @date 2024/2/26 13:37 */ @Data -public class BaseGoodsTypeVo implements Vo { +public class GoodsTypeVo implements Vo { private String id; private String sid; private String lockVersion; diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnit.java b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnit.java similarity index 65% rename from src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnit.java rename to src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnit.java index 639239a..93683e3 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnit.java +++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnit.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodsunit; +package com.yxt.goods.biz.goodsunit; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @date 2024/2/26 13:36 */ @Data -public class BaseGoodsUnit extends BaseEntity { +public class GoodsUnit extends BaseEntity { private String unitName;//单位名称 } diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitDto.java b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitDto.java similarity index 87% rename from src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitDto.java rename to src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitDto.java index 4cc71eb..dfac84e 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitDto.java +++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitDto.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodsunit; +package com.yxt.goods.biz.goodsunit; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; @@ -11,7 +11,7 @@ import java.util.Date; * @date 2024/2/26 13:38 */ @Data -public class BaseGoodsUnitDto implements Dto { +public class GoodsUnitDto implements Dto { private String id; private String sid; private String lockVersion; diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitMapper.java b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.java similarity index 61% rename from src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitMapper.java rename to src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.java index 737a308..149fc25 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitMapper.java +++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodsunit; +package com.yxt.goods.biz.goodsunit; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Param; * @date 2024/2/26 13:40 */ @Mapper -public interface BaseGoodsUnitMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +public interface GoodsUnitMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml similarity index 67% rename from src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml rename to src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml index 09c8848..c04a28b 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml @@ -1,10 +1,10 @@ - + - select * from base_goods_unit diff --git a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitQuery.java b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitQuery.java new file mode 100644 index 0000000..3390bb1 --- /dev/null +++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitQuery.java @@ -0,0 +1,13 @@ +package com.yxt.goods.biz.goodsunit; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class GoodsUnitQuery implements Query { + private String name; +} diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitService.java b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java similarity index 68% rename from src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitService.java rename to src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java index 554b354..44b28f4 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitService.java +++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodsunit; +package com.yxt.goods.biz.goodsunit; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; @@ -10,7 +10,6 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.goods.biz.base.basebrandinfo.BaseBrandInfo; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; @@ -22,39 +21,39 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Service -public class BaseGoodsUnitService extends MybatisBaseService { +public class GoodsUnitService extends MybatisBaseService { - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - BaseGoodsUnitQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + GoodsUnitQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if(StringUtils.isNotBlank(query.getName())){ qw.like("unitName",query.getName()); } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); return rb.success().setData(p); - } public ResultBean> listAll() { + } public ResultBean> listAll() { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); return rb.success().setData(pagging); } - public ResultBean saveOrUpdate(BaseGoodsUnitDto dto) { + public ResultBean saveOrUpdate(GoodsUnitDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); - BaseGoodsUnit wmsGoodsType = fetchBySid(dto.getSid()); + GoodsUnit wmsGoodsType = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, wmsGoodsType, "id", "sid"); wmsGoodsType.setModifyTime(new Date()); baseMapper.updateById(wmsGoodsType); } else { - BaseGoodsUnit wmsGoods = new BaseGoodsUnit(); + GoodsUnit wmsGoods = new GoodsUnit(); sid = wmsGoods.getSid(); BeanUtil.copyProperties(dto, wmsGoods, "id", "sid"); wmsGoods.setCreateTime(new DateTime()); @@ -68,10 +67,10 @@ public class BaseGoodsUnitService extends MybatisBaseService initialization(String sid) { + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); - BaseGoodsUnitVo vo = new BaseGoodsUnitVo(); - BaseGoodsUnit wmsGoodsType = fetchBySid(sid); + GoodsUnitVo vo = new GoodsUnitVo(); + GoodsUnit wmsGoodsType = fetchBySid(sid); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); BeanUtil.copyProperties(wmsGoodsType, vo); if (null != wmsGoodsType) { @@ -90,7 +89,7 @@ public class BaseGoodsUnitService extends MybatisBaseService getUnitByName(String name) { + public ResultBean getUnitByName(String name) { ResultBean rb = ResultBean.fireFail(); - BaseGoodsUnit type=baseMapper.selectOne(new QueryWrapper().eq("unitName",name)); + GoodsUnit type=baseMapper.selectOne(new QueryWrapper().eq("unitName",name)); return rb.success().setData(type); } } diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitVo.java b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitVo.java similarity index 87% rename from src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitVo.java rename to src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitVo.java index bc062b8..0205f89 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitVo.java +++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitVo.java @@ -1,4 +1,4 @@ -package com.yxt.goods.biz.base.basegoodsunit; +package com.yxt.goods.biz.goodsunit; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; @@ -11,7 +11,7 @@ import java.util.Date; * @date 2024/2/26 13:37 */ @Data -public class BaseGoodsUnitVo implements Vo { +public class GoodsUnitVo implements Vo { private String id; private String sid; private String lockVersion;