From c53010698e92c0d42347c652388db0d1a7801f0f Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 17 Mar 2025 14:56:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=8D=93=E6=9C=BA=E8=B6=85=E5=B8=82?= =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/feign/RemoteSupermarketCategoryService.java | 5 ++++- .../api/feign/RemoteSupermarketSpuService.java | 6 ++++-- .../supermarket/controller/SmErpCategoryController.java | 2 +- .../supermarket/controller/SmErpSpuController.java | 8 +++++--- .../bsd/pjcloud/supermarket/service/SmErpSpuService.java | 7 +++++-- .../supermarket/service/impl/SmErpSpuServiceImpl.java | 5 +++-- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketCategoryService.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketCategoryService.java index 51e1015d4..9e3f666a7 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketCategoryService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketCategoryService.java @@ -3,10 +3,13 @@ package com.bsd.pjcloud.supermarket.api.feign; import com.bsd.pjcloud.common.core.constant.ServiceNameConstants; import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.supermarket.vo.erp.SmErpCategorySimpleVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * @author zjf * @date 2018/6/22 @@ -22,6 +25,6 @@ public interface RemoteSupermarketCategoryService { * @return R */ @GetMapping("/supermarketCategory/simpleAll") - R getSimpleAll(); + R> getSimpleAll(); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java index 3c0ed7888..00291ffa5 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java @@ -26,6 +26,8 @@ import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.feign.annotation.NoToken; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuQueryDTO; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockReqDTO; +import com.bsd.pjcloud.supermarket.vo.ad.SmErpSpuDetailsVo; +import com.bsd.pjcloud.supermarket.vo.ad.SpuVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -45,7 +47,7 @@ public interface RemoteSupermarketSpuService { * @return R */ @PostMapping("/supermarketSpu/ad/selectListAll") - R getSupermarketSpuScope(@RequestParam Page page,@RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO); + R> getSupermarketSpuScope(@RequestParam Page page, @RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO); @@ -55,7 +57,7 @@ public interface RemoteSupermarketSpuService { * @return */ @GetMapping("/supermarketSpu/ad/SpuDetails") - R getSupermarketSpuDetailById(@RequestParam("id")Long id); + R getSupermarketSpuDetailById(@RequestParam("id")Long id); /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCategoryController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCategoryController.java index 3a9c91f5f..de011e7ec 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCategoryController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCategoryController.java @@ -144,7 +144,7 @@ public class SmErpCategoryController { */ @Operation(summary = "APP分类查询",description = "通过商户id获取该商户下的分类") @GetMapping("/app/simpleAll") - public R getAppSimpleAll(@RequestParam("merchantId")Long merchantId) { + public R> getAppSimpleAll(@RequestParam("merchantId")Long merchantId) { List list = smErpCategoryService. list(new LambdaQueryWrapper().eq(SmErpCategoryEntity::getMerchantId, merchantId)); List bean = BeanUtils.toBean(list, SmErpCategorySimpleVo.class); diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java index a8694513c..0b3c584dc 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java @@ -21,6 +21,8 @@ import com.bsd.pjcloud.supermarket.entity.SmErpStockEntity; import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity; import com.bsd.pjcloud.supermarket.service.*; import com.bsd.pjcloud.supermarket.task.TaskStoreService; +import com.bsd.pjcloud.supermarket.vo.ad.SmErpSpuDetailsVo; +import com.bsd.pjcloud.supermarket.vo.ad.SpuVo; import com.bsd.pjcloud.supermarket.vo.erpspu.SmErpSpuSimpleVo; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -251,7 +253,7 @@ public class SmErpSpuController { @Operation(summary = "安卓机条件查询所有" , description = "安卓机条件查询所有" ) @PostMapping("/ad/selectListAll" ) @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_view')" ) - public R getSupermarketSpuByScope(@ParameterObject Page page,@RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO) { + public R> getSupermarketSpuByScope(@ParameterObject Page page, @RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO) { return R.ok(smErpSpuService.selectListAllScope(page,supermarketSpuQueryDTO)); } @@ -261,9 +263,9 @@ public class SmErpSpuController { * @param id * @return */ - @Operation(summary = "条件查询所有" , description = "条件查询所有" ) + @Operation(summary = "spu详情" , description = "spu详情" ) @GetMapping("/ad/SpuDetails" ) - public R getSupermarketSpuDetailById(@RequestParam("id")Long id) { + public R getSupermarketSpuDetailById(@RequestParam("id")Long id) { return R.ok(smErpSpuService.getSupermarketSpuDetailById(id)); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java index b9c6e07ad..79403e9f0 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java @@ -1,6 +1,7 @@ package com.bsd.pjcloud.supermarket.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.bsd.pjcloud.common.core.util.R; @@ -9,6 +10,8 @@ import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockReqDTO; import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanDTO; import com.bsd.pjcloud.supermarket.dto.erpspu.SmErpSpuImportDto; import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity; +import com.bsd.pjcloud.supermarket.vo.ad.SmErpSpuDetailsVo; +import com.bsd.pjcloud.supermarket.vo.ad.SpuVo; import com.bsd.pjcloud.supermarket.vo.cgplan.ErpSpuWithUnitPageVo; import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo; import org.springdoc.core.annotations.ParameterObject; @@ -50,7 +53,7 @@ public interface SmErpSpuService extends IService { * @param * @return */ - Object selectListAllScope(@ParameterObject Page page,SupermarketSpuQueryDTO supermarketSpuQueryDTO); + Page selectListAllScope(@ParameterObject Page page, SupermarketSpuQueryDTO supermarketSpuQueryDTO); /** @@ -58,7 +61,7 @@ public interface SmErpSpuService extends IService { * @param id * @return */ - Object getSupermarketSpuDetailById(Long id); + SmErpSpuDetailsVo getSupermarketSpuDetailById(Long id); /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java index a50ea9c52..a79229d3a 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java @@ -2,6 +2,7 @@ package com.bsd.pjcloud.supermarket.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.common.core.util.BeanUtils; @@ -378,7 +379,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl selectListAllScope(@ParameterObject Page page, SupermarketSpuQueryDTO supermarketSpuQueryDTO) { Page list = baseMapper.selectListAllScope(page,supermarketSpuQueryDTO, DataScope.of()); return list; @@ -387,7 +388,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl smErpUnitEntityList = smErpUnitService.list(new LambdaQueryWrapper().eq(SmErpUnitEntity::getSpuId, id)); List supermarketAuxiliaryCodeEntities = smErpAuxiliaryCodeService.list(new LambdaQueryWrapper().eq(SmErpAuxiliaryCodeEntity::getSpuId, id));