安卓机超市商品详情接口

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<List<SmErpCategorySimpleVo>> getSimpleAll();
 
 }

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<Page<SpuVo>> 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<SmErpSpuDetailsVo> getSupermarketSpuDetailById(@RequestParam("id")Long id);
 
 
     /**

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<List<SmErpCategorySimpleVo>> getAppSimpleAll(@RequestParam("merchantId")Long merchantId) {
         List<SmErpCategoryEntity> list = smErpCategoryService.
                 list(new LambdaQueryWrapper<SmErpCategoryEntity>().eq(SmErpCategoryEntity::getMerchantId, merchantId));
         List<SmErpCategorySimpleVo> bean = BeanUtils.toBean(list, SmErpCategorySimpleVo.class);

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<Page<SpuVo>> 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<SmErpSpuDetailsVo> getSupermarketSpuDetailById(@RequestParam("id")Long id) {
         return R.ok(smErpSpuService.getSupermarketSpuDetailById(id));
     }
 

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<SmErpSpuEntity> {
      * @param
      * @return
      */
-    Object selectListAllScope(@ParameterObject Page page,SupermarketSpuQueryDTO supermarketSpuQueryDTO);
+    Page<SpuVo> selectListAllScope(@ParameterObject Page page, SupermarketSpuQueryDTO supermarketSpuQueryDTO);
 
 
     /**
@@ -58,7 +61,7 @@ public interface SmErpSpuService extends IService<SmErpSpuEntity> {
      * @param id
      * @return
      */
-    Object getSupermarketSpuDetailById(Long id);
+    SmErpSpuDetailsVo getSupermarketSpuDetailById(Long id);
 
 
     /**

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<SmErpSpuMapper, SmErpSpuEnt
     }
 
     @Override
-    public Object selectListAllScope(@ParameterObject Page page,SupermarketSpuQueryDTO supermarketSpuQueryDTO) {
+    public  Page<SpuVo> selectListAllScope(@ParameterObject Page page, SupermarketSpuQueryDTO supermarketSpuQueryDTO) {
 
         Page<SpuVo> list = baseMapper.selectListAllScope(page,supermarketSpuQueryDTO, DataScope.of());
         return list;
@@ -387,7 +388,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
     }
 
     @Override
-    public Object getSupermarketSpuDetailById(Long id) {
+    public SmErpSpuDetailsVo getSupermarketSpuDetailById(Long id) {
         SmErpSpuEntity smErpSpuEntity = baseMapper.selectById(id);
         List<SmErpUnitEntity> smErpUnitEntityList = smErpUnitService.list(new LambdaQueryWrapper<SmErpUnitEntity>().eq(SmErpUnitEntity::getSpuId, id));
         List<SmErpAuxiliaryCodeEntity> supermarketAuxiliaryCodeEntities = smErpAuxiliaryCodeService.list(new LambdaQueryWrapper<SmErpAuxiliaryCodeEntity>().eq(SmErpAuxiliaryCodeEntity::getSpuId, id));