From 071fe23e35c60823a2e3180f582caaf290e00be1 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 7 Jan 2025 16:12:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feign=E9=85=8D=E7=BD=AEapi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org.springframework.cloud.openfeign.FeignClient.imports | 5 +++++ .../org.springframework.cloud.openfeign.FeignClient.imports | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 pjcloud-canteen/pjcloud-canteen-api/src/main/resources/spring/org.springframework.cloud.openfeign.FeignClient.imports create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/resources/org.springframework.cloud.openfeign.FeignClient.imports diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/resources/spring/org.springframework.cloud.openfeign.FeignClient.imports b/pjcloud-canteen/pjcloud-canteen-api/src/main/resources/spring/org.springframework.cloud.openfeign.FeignClient.imports new file mode 100644 index 000000000..f65c6ae23 --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/resources/spring/org.springframework.cloud.openfeign.FeignClient.imports @@ -0,0 +1,5 @@ +com.bsd.pjcloud.canteen.api.feign.RemoteCanteenCategoryService +com.bsd.pjcloud.canteen.api.feign.RemoteCanteenOnlineCategoryService +com.bsd.pjcloud.canteen.api.feign.RemoteCanteenSpuService +com.bsd.pjcloud.canteen.api.feign.RemoteOnlineCanteenSpuService + diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/resources/org.springframework.cloud.openfeign.FeignClient.imports b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/resources/org.springframework.cloud.openfeign.FeignClient.imports new file mode 100644 index 000000000..3a54f37cd --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/resources/org.springframework.cloud.openfeign.FeignClient.imports @@ -0,0 +1,3 @@ +com.bsd.pjcloud.supermarket.api.feign.RemoteSupermarketCategoryService +com.bsd.pjcloud.supermarket.api.feign.RemoteSupermarketSpuService +com.bsd.pjcloud.supermarket.api.feign.RemoteSupermarketUnitSkuService \ No newline at end of file From b08f13d10ec7bf663fec11e739c68605dcf44296 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 7 Jan 2025 16:47:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pjcloud-canteen/pjcloud-canteen-api/pom.xml | 4 + .../entity/BoxesAvailabilityEntity.java | 0 .../canteen/entity/BoxesBookingEntity.java | 0 .../canteen/entity/BoxesInfoEntity.java | 0 .../canteen/entity/CanteenCategoryEntity.java | 0 .../entity/CanteenDailyMenuEntity.java | 0 .../entity/CanteenOnlineCategoryEntity.java | 0 .../entity/CanteenOnlineSpuEntity.java | 0 .../canteen/entity/CanteenSpuEntity.java | 0 .../canteen/entity/MerchantInfoEntity.java | 0 .../BoxesAvailabilityController.java | 1 - .../controller/BoxesBookingController.java | 4 - .../controller/BoxesInfoController.java | 2 - .../controller/CanteenCategoryController.java | 1 - .../CanteenDailyMenuController.java | 1 - .../CanteenOnlineCategoryController.java | 3 - .../CanteenOnlineSpuController.java | 2 - .../CanteenOrderingPreferencesController.java | 14 -- .../controller/CanteenSpuController.java | 3 - .../controller/MerchantInfoController.java | 7 - .../canteen/job/BoxesAvaliabilityJob.java | 1 - .../mapper/CanteenOnlineSpuMapper.java | 1 - .../canteen/mapper/CanteenSpuMapper.java | 4 - .../mapper/OrderingPreferencesMapper.java | 1 - .../canteen/service/CanteenSpuService.java | 3 - .../impl/CanteenCategoryServiceImpl.java | 1 - .../impl/CanteenOnlineSpuServiceImpl.java | 3 - .../service/impl/CanteenSpuServiceImpl.java | 4 - .../pjcloud-supermarket-api/pom.xml | 4 + .../SupermarketAuxiliaryCodeEntity.java | 0 .../entity/SupermarketBrandEntity.java | 0 .../entity/SupermarketCategoryEntity.java | 0 .../entity/SupermarketSpuEntity.java | 0 .../entity/SupermarketUnitEntity.java | 0 .../vo/SupermarketUnitWithSpuVo.java | 120 ++++++++++++++++++ .../SupermarketBrandController.java | 3 - .../SupermarketCategoryController.java | 1 - .../controller/SupermarketSpuController.java | 2 + .../controller/SupermarketUnitController.java | 8 +- .../mapper/SupermarketUnitMapper.java | 9 ++ .../service/SupermarketUnitService.java | 9 ++ .../impl/SupermarketUnitServiceImpl.java | 9 ++ .../mapper/SupermarketUnitMapper.xml | 47 +++++++ 43 files changed, 208 insertions(+), 64 deletions(-) rename pjcloud-canteen/{pjcloud-canteen-biz => pjcloud-canteen-api}/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesAvailabilityEntity.java (100%) rename pjcloud-canteen/{pjcloud-canteen-biz => pjcloud-canteen-api}/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java (100%) rename pjcloud-canteen/{pjcloud-canteen-biz => pjcloud-canteen-api}/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesInfoEntity.java (100%) rename pjcloud-canteen/{pjcloud-canteen-biz => pjcloud-canteen-api}/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenCategoryEntity.java (100%) rename pjcloud-canteen/{pjcloud-canteen-biz => pjcloud-canteen-api}/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenDailyMenuEntity.java (100%) rename pjcloud-canteen/{pjcloud-canteen-biz => pjcloud-canteen-api}/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenOnlineCategoryEntity.java (100%) rename pjcloud-canteen/{pjcloud-canteen-biz => pjcloud-canteen-api}/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenOnlineSpuEntity.java (100%) rename pjcloud-canteen/{pjcloud-canteen-biz => pjcloud-canteen-api}/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java (100%) rename pjcloud-canteen/{pjcloud-canteen-biz => pjcloud-canteen-api}/src/main/java/com/bsd/pjcloud/canteen/entity/MerchantInfoEntity.java (100%) rename pjcloud-supermarket/{pjcloud-supermarket-biz => pjcloud-supermarket-api}/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketAuxiliaryCodeEntity.java (100%) rename pjcloud-supermarket/{pjcloud-supermarket-biz => pjcloud-supermarket-api}/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketBrandEntity.java (100%) rename pjcloud-supermarket/{pjcloud-supermarket-biz => pjcloud-supermarket-api}/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketCategoryEntity.java (100%) rename pjcloud-supermarket/{pjcloud-supermarket-biz => pjcloud-supermarket-api}/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketSpuEntity.java (100%) rename pjcloud-supermarket/{pjcloud-supermarket-biz => pjcloud-supermarket-api}/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketUnitEntity.java (100%) create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketUnitWithSpuVo.java diff --git a/pjcloud-canteen/pjcloud-canteen-api/pom.xml b/pjcloud-canteen/pjcloud-canteen-api/pom.xml index 67568f573..974bcb971 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/pom.xml +++ b/pjcloud-canteen/pjcloud-canteen-api/pom.xml @@ -28,6 +28,10 @@ com.baomidou mybatis-plus-extension + + com.baomidou + mybatis-plus-spring + com.bsd diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesAvailabilityEntity.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesAvailabilityEntity.java similarity index 100% rename from pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesAvailabilityEntity.java rename to pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesAvailabilityEntity.java diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java similarity index 100% rename from pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java rename to pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesInfoEntity.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesInfoEntity.java similarity index 100% rename from pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesInfoEntity.java rename to pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesInfoEntity.java diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenCategoryEntity.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenCategoryEntity.java similarity index 100% rename from pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenCategoryEntity.java rename to pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenCategoryEntity.java diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenDailyMenuEntity.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenDailyMenuEntity.java similarity index 100% rename from pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenDailyMenuEntity.java rename to pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenDailyMenuEntity.java diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenOnlineCategoryEntity.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenOnlineCategoryEntity.java similarity index 100% rename from pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenOnlineCategoryEntity.java rename to pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenOnlineCategoryEntity.java diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenOnlineSpuEntity.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenOnlineSpuEntity.java similarity index 100% rename from pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenOnlineSpuEntity.java rename to pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenOnlineSpuEntity.java diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java similarity index 100% rename from pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java rename to pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/MerchantInfoEntity.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/MerchantInfoEntity.java similarity index 100% rename from pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/MerchantInfoEntity.java rename to pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/MerchantInfoEntity.java diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesAvailabilityController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesAvailabilityController.java index 359c167ef..39dfd69c8 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesAvailabilityController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesAvailabilityController.java @@ -1,6 +1,5 @@ package com.bsd.pjcloud.canteen.controller; -import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java index fe1893801..9a4283f85 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java @@ -1,19 +1,15 @@ package com.bsd.pjcloud.canteen.controller; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.bsd.pjcloud.canteen.vo.APPBookingInfo; import com.bsd.pjcloud.canteen.vo.AppMakeSaveReqVO; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.canteen.entity.BoxesBookingEntity; import com.bsd.pjcloud.canteen.service.BoxesBookingService; -import org.springframework.beans.BeanUtils; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesInfoController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesInfoController.java index 45a95b088..a85b282f7 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesInfoController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesInfoController.java @@ -1,6 +1,5 @@ package com.bsd.pjcloud.canteen.controller; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.collection.CollUtil; @@ -30,7 +29,6 @@ import org.springframework.web.bind.annotation.*; import java.time.LocalDate; import java.util.ArrayList; import java.util.List; -import java.util.Objects; /** * 包厢信息 diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java index fa45ba0f2..96ff72bc2 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java @@ -23,7 +23,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Objects; /** * 菜品分类 diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java index 0ed91fb9d..8de7253ae 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java @@ -27,7 +27,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Objects; /** * 每日菜谱 diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineCategoryController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineCategoryController.java index 5ce74f690..96b16a655 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineCategoryController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineCategoryController.java @@ -6,12 +6,10 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.bsd.pjcloud.canteen.entity.CanteenCategoryEntity; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.canteen.entity.CanteenOnlineCategoryEntity; import com.bsd.pjcloud.canteen.service.CanteenOnlineCategoryService; -import org.apache.commons.lang3.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -23,7 +21,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Objects; /** * 在线点餐分类 diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineSpuController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineSpuController.java index 7cdde01e5..a7239996c 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineSpuController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineSpuController.java @@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.canteen.dto.CanteenOnlineSpuUpdateStockReqDTO; -import com.bsd.pjcloud.canteen.dto.CanteenSpuUpdateStockReqDTO; -import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.canteen.entity.CanteenOnlineSpuEntity; diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOrderingPreferencesController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOrderingPreferencesController.java index 4cc543ce6..bd11ddc69 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOrderingPreferencesController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOrderingPreferencesController.java @@ -1,31 +1,17 @@ package com.bsd.pjcloud.canteen.controller; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.canteen.dto.UserPageDTO; -import com.bsd.pjcloud.canteen.entity.CanteenCategoryEntity; -import com.bsd.pjcloud.canteen.service.CanteenCategoryService; import com.bsd.pjcloud.canteen.service.OrderingPreferencesService; -import com.bsd.pjcloud.canteen.vo.LikeFoodVO; import com.bsd.pjcloud.common.core.util.R; -import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; -import com.bsd.pjcloud.common.log.annotation.SysLog; -import com.bsd.pjcloud.common.security.util.SecurityUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * 用户订餐喜好分析 * diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java index c80ba103d..02213fad8 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java @@ -3,12 +3,10 @@ package com.bsd.pjcloud.canteen.controller; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.collection.CollUtil; -import com.alibaba.excel.util.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.canteen.dto.CanteenSpuUpdateStockReqDTO; -import com.bsd.pjcloud.canteen.entity.CanteenDailyMenuEntity; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity; @@ -24,7 +22,6 @@ import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -import java.util.Collection; import java.util.List; import java.util.Objects; diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/MerchantInfoController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/MerchantInfoController.java index 06ea978eb..05104e737 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/MerchantInfoController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/MerchantInfoController.java @@ -2,7 +2,6 @@ package com.bsd.pjcloud.canteen.controller; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.extra.qrcode.QrCodeUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -14,15 +13,10 @@ import com.bsd.pjcloud.canteen.vo.MerchantCollectMoneyCodeDto; import com.bsd.pjcloud.canteen.vo.MerchantInfoVO; import com.bsd.pjcloud.common.core.util.QRCodeImageGenerator; import com.bsd.pjcloud.common.core.util.R; -import com.bsd.pjcloud.common.file.core.FileProperties; -import com.bsd.pjcloud.common.file.core.FileTemplate; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.canteen.entity.MerchantInfoEntity; import com.bsd.pjcloud.canteen.service.MerchantInfoService; -import feign.Response; -import io.swagger.v3.oas.annotations.Parameter; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mock.web.MockMultipartFile; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; @@ -38,7 +32,6 @@ import org.springframework.web.multipart.MultipartFile; import java.io.ByteArrayInputStream; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.stream.Collectors; /** diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/job/BoxesAvaliabilityJob.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/job/BoxesAvaliabilityJob.java index eed1f54f3..82fe613c8 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/job/BoxesAvaliabilityJob.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/job/BoxesAvaliabilityJob.java @@ -6,7 +6,6 @@ import com.bsd.pjcloud.canteen.entity.BoxesInfoEntity; import com.bsd.pjcloud.canteen.mapper.BoxesAvailabilityMapper; import com.bsd.pjcloud.canteen.mapper.BoxesInfoMapper; import com.bsd.pjcloud.canteen.service.BoxesAvailabilityService; -import com.bsd.pjcloud.canteen.service.BoxesInfoService; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.AllArgsConstructor; diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenOnlineSpuMapper.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenOnlineSpuMapper.java index 152d75e6e..da1650ca2 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenOnlineSpuMapper.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenOnlineSpuMapper.java @@ -1,7 +1,6 @@ package com.bsd.pjcloud.canteen.mapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import com.bsd.pjcloud.canteen.entity.CanteenOnlineSpuEntity; import org.apache.ibatis.annotations.Mapper; diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenSpuMapper.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenSpuMapper.java index 2449b7b3c..227f5f9af 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenSpuMapper.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenSpuMapper.java @@ -1,14 +1,10 @@ package com.bsd.pjcloud.canteen.mapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.bsd.pjcloud.canteen.dto.DailyMenuAll; -import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - @Mapper public interface CanteenSpuMapper extends PjcloudBaseMapper { diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/OrderingPreferencesMapper.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/OrderingPreferencesMapper.java index cb9a3a6c6..d70329c5f 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/OrderingPreferencesMapper.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/OrderingPreferencesMapper.java @@ -3,7 +3,6 @@ package com.bsd.pjcloud.canteen.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.canteen.dto.UserPageDTO; -import com.bsd.pjcloud.canteen.entity.MerchantInfoEntity; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java index e0963b5f4..fae38bf69 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java @@ -3,12 +3,9 @@ package com.bsd.pjcloud.canteen.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.bsd.pjcloud.canteen.dto.CanteenSpuUpdateStockReqDTO; -import com.bsd.pjcloud.canteen.dto.DailyMenuAll; import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity; import com.bsd.pjcloud.common.core.util.R; -import java.util.List; - public interface CanteenSpuService extends IService { diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenCategoryServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenCategoryServiceImpl.java index c954f8c32..16147477b 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenCategoryServiceImpl.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenCategoryServiceImpl.java @@ -7,7 +7,6 @@ import com.bsd.pjcloud.canteen.entity.CanteenCategoryEntity; import com.bsd.pjcloud.canteen.mapper.CanteenCategoryMapper; import com.bsd.pjcloud.canteen.service.CanteenCategoryService; import com.bsd.pjcloud.common.data.datascope.DataScope; -import com.bsd.pjcloud.common.security.util.SecurityUtils; import org.springframework.stereotype.Service; import java.util.List; diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenOnlineSpuServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenOnlineSpuServiceImpl.java index b6cf1a685..500ccdc81 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenOnlineSpuServiceImpl.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenOnlineSpuServiceImpl.java @@ -4,14 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.canteen.dto.CanteenOnlineSpuUpdateStockReqDTO; import com.bsd.pjcloud.canteen.entity.CanteenOnlineSpuEntity; -import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity; import com.bsd.pjcloud.canteen.mapper.CanteenOnlineSpuMapper; import com.bsd.pjcloud.canteen.service.CanteenOnlineSpuService; -import com.bsd.pjcloud.canteen.vo.ADCanteenSpuListVO; import com.bsd.pjcloud.canteen.vo.APPOnlineSpuVO; import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; -import com.bsd.pjcloud.common.data.datascope.DataScope; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java index 5ce70a262..e8d924887 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java @@ -3,7 +3,6 @@ package com.bsd.pjcloud.canteen.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.canteen.dto.CanteenSpuUpdateStockReqDTO; -import com.bsd.pjcloud.canteen.dto.DailyMenuAll; import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity; import com.bsd.pjcloud.canteen.mapper.CanteenSpuMapper; import com.bsd.pjcloud.canteen.service.CanteenDailyMenuService; @@ -12,10 +11,7 @@ import com.bsd.pjcloud.canteen.vo.ADCanteenSpuListVO; import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.data.datascope.DataScope; -import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.AllArgsConstructor; -import lombok.Data; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/pom.xml b/pjcloud-supermarket/pjcloud-supermarket-api/pom.xml index b4c85b903..00bbe0860 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/pom.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-api/pom.xml @@ -28,6 +28,10 @@ com.baomidou mybatis-plus-extension + + com.baomidou + mybatis-plus-spring + com.bsd diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketAuxiliaryCodeEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketAuxiliaryCodeEntity.java similarity index 100% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketAuxiliaryCodeEntity.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketAuxiliaryCodeEntity.java diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketBrandEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketBrandEntity.java similarity index 100% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketBrandEntity.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketBrandEntity.java diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketCategoryEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketCategoryEntity.java similarity index 100% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketCategoryEntity.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketCategoryEntity.java diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketSpuEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketSpuEntity.java similarity index 100% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketSpuEntity.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketSpuEntity.java diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketUnitEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketUnitEntity.java similarity index 100% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketUnitEntity.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketUnitEntity.java diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketUnitWithSpuVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketUnitWithSpuVo.java new file mode 100644 index 000000000..a536ad029 --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketUnitWithSpuVo.java @@ -0,0 +1,120 @@ +package com.bsd.pjcloud.supermarket.vo; + +import com.baomidou.mybatisplus.annotation.*; +import com.bsd.pjcloud.common.core.util.MoneyDeserializer; +import com.bsd.pjcloud.common.core.util.MoneySerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class SupermarketUnitWithSpuVo { + + /** + * 货号 + */ + @Schema(description="货号") + private String productCode; + + /** + * 自编码/条码 + */ + @Schema(description="自编码/条码") + private String barcode; + + /** + * 商品封面图 + */ + @Schema(description="商品封面图") + private String picUrl; + + /** + * 商品名称 + */ + @Schema(description="商品名称") + private String productName; + + + /** + * 商品分类编号 + */ + @Schema(description="商品分类编号") + private Long categoryId; + + + + /** + * 品牌id + */ + @Schema(description="品牌id") + private Long brandId; + + + /** + * sku参数 + */ + /** + * 包装单位id + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="包装单位id") + private Long id; + + /** + * 条码 + */ + @Schema(description="条码") + private String barCode; + + /** + * 规格 + */ + @Schema(description="规格") + private String spec; + + /** + * 单位 + */ + @Schema(description="单位") + private String unit; + + /** + * 状态(0正常，1停销) + */ + @Schema(description="状态(0正常，1停销)") + private Integer status; + + /** + * 内装数量 + */ + @Schema(description="内装数量") + private Integer packageNum; + + /** + * 进价/单位分 + */ + @Schema(description="进价") + @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 + @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 + private Integer purchasePrice; + + /** + * 零售价/单位分 + */ + @Schema(description="零售价") + @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 + @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 + private Integer retailPrice; + + /** + * spuID + */ + @Schema(description="spuID") + private Long spuId; + + + +} diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketBrandController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketBrandController.java index 25af8b748..287c68561 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketBrandController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketBrandController.java @@ -10,10 +10,8 @@ import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.supermarket.entity.SupermarketBrandEntity; -import com.bsd.pjcloud.supermarket.entity.SupermarketCategoryEntity; import com.bsd.pjcloud.supermarket.service.SupermarketBrandService; import com.bsd.pjcloud.supermarket.vo.SupermarketBrandSimpleVo; -import com.bsd.pjcloud.supermarket.vo.SupermarketCategorySimpleVo; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -25,7 +23,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Objects; /** * 超市品牌 diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketCategoryController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketCategoryController.java index e796ae06a..089e9dd79 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketCategoryController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketCategoryController.java @@ -23,7 +23,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Objects; /** * 商品分类 diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketSpuController.java index fa804d48c..fd9a0bbc9 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketSpuController.java @@ -176,4 +176,6 @@ public class SupermarketSpuController { } + + } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketUnitController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketUnitController.java index 661eddfd0..09525fec1 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketUnitController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketUnitController.java @@ -124,14 +124,14 @@ public class SupermarketUnitController { // -----------------APP------------------------------ /** - * 通过id查询商品包装单位(sku) + * 通过ids查询商品包装单位(sku) * @param ids * @return R */ - @Operation(summary = "通过id查询" , description = "通过id查询" ) - @GetMapping("/ad/getSupermarketUnits" ) + @Operation(summary = "通过ids查询" , description = "通过ids查询" ) + @PostMapping("/ad/getSupermarketUnits" ) public R getSupermarketUnits(@RequestBody List ids) { - return R.ok(supermarketUnitService.list(new LambdaQueryWrapper().in(SupermarketUnitEntity::getId,ids))); + return R.ok(supermarketUnitService.getSupermarketUnitsWithSpu(ids)); } } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketUnitMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketUnitMapper.java index a6719ee71..485e90989 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketUnitMapper.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketUnitMapper.java @@ -2,10 +2,19 @@ package com.bsd.pjcloud.supermarket.mapper; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import com.bsd.pjcloud.supermarket.entity.SupermarketUnitEntity; +import com.bsd.pjcloud.supermarket.vo.SupermarketUnitWithSpuVo; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface SupermarketUnitMapper extends PjcloudBaseMapper { + /** + * 根据ids获取超市包装单位信息和商品信息 + * @param ids + * @return + */ + List getSupermarketUnitsWithSpu(List ids); } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketUnitService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketUnitService.java index ec3eb3031..36b17bfa4 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketUnitService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketUnitService.java @@ -2,8 +2,17 @@ package com.bsd.pjcloud.supermarket.service; import com.baomidou.mybatisplus.extension.service.IService; import com.bsd.pjcloud.supermarket.entity.SupermarketUnitEntity; +import com.bsd.pjcloud.supermarket.vo.SupermarketUnitWithSpuVo; + +import java.util.List; public interface SupermarketUnitService extends IService { + /** + * 根据包装单位id，查询商品包装单位信息以及spu基础信息 + * @param ids + * @return + */ + List getSupermarketUnitsWithSpu(List ids); } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketUnitServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketUnitServiceImpl.java index af64744d1..d36b2c604 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketUnitServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketUnitServiceImpl.java @@ -4,7 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.supermarket.entity.SupermarketUnitEntity; import com.bsd.pjcloud.supermarket.mapper.SupermarketUnitMapper; import com.bsd.pjcloud.supermarket.service.SupermarketUnitService; +import com.bsd.pjcloud.supermarket.vo.SupermarketUnitWithSpuVo; import org.springframework.stereotype.Service; + +import java.util.List; + /** * 商品包装单位(sku) * @@ -13,4 +17,9 @@ import org.springframework.stereotype.Service; */ @Service public class SupermarketUnitServiceImpl extends ServiceImpl implements SupermarketUnitService { + @Override + public List getSupermarketUnitsWithSpu(List ids) { + + return baseMapper.getSupermarketUnitsWithSpu(ids); + } } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketUnitMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketUnitMapper.xml index 232a4281c..0406d40e0 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketUnitMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketUnitMapper.xml @@ -22,4 +22,51 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 00224d3151e61248fcd0d1a5363b5d0033316680 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 7 Jan 2025 16:52:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CanteenCategoryMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenCategoryMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenCategoryMapper.xml index 5b15ed334..b70cee1d7 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenCategoryMapper.xml +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenCategoryMapper.xml @@ -18,5 +18,6 @@ + \ No newline at end of file From 7d4e7e5a0d1c979f8c9a0df95d06c04ad33d176b Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 7 Jan 2025 17:01:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9feign=E5=BC=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org.springframework.cloud.openfeign.FeignClient.imports | 0 .../org.springframework.cloud.openfeign.FeignClient.imports | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename pjcloud-canteen/pjcloud-canteen-api/src/main/resources/{ => META-INF}/spring/org.springframework.cloud.openfeign.FeignClient.imports (100%) rename pjcloud-supermarket/pjcloud-supermarket-api/src/main/resources/{ => META-INF/spring}/org.springframework.cloud.openfeign.FeignClient.imports (100%) diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/resources/spring/org.springframework.cloud.openfeign.FeignClient.imports b/pjcloud-canteen/pjcloud-canteen-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports similarity index 100% rename from pjcloud-canteen/pjcloud-canteen-api/src/main/resources/spring/org.springframework.cloud.openfeign.FeignClient.imports rename to pjcloud-canteen/pjcloud-canteen-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/resources/org.springframework.cloud.openfeign.FeignClient.imports b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports similarity index 100% rename from pjcloud-supermarket/pjcloud-supermarket-api/src/main/resources/org.springframework.cloud.openfeign.FeignClient.imports rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports