From 6adedb1687667d4dc74f5649318738d4da62c90d Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 11 Mar 2020 22:15:22 +0800 Subject: [PATCH] =?UTF-8?q?yshop2.0.2,=E4=BF=AE=E5=A4=8Dissue#I1B8RB,#I1B4?= =?UTF-8?q?9Y,#I1BASM,#I1B9O7,#I1B9ED?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/web/controller/UserBillController.java | 2 +- .../repository/YxStoreCategoryRepository.java | 2 ++ .../repository/YxStoreProductRepository.java | 4 ++++ .../shop/rest/StoreCategoryController.java | 7 +++++-- .../shop/rest/StoreProductController.java | 1 - .../service/impl/YxStoreCategoryServiceImpl.java | 16 ++++++++++++++-- .../impl/YxStoreProductReplyServiceImpl.java | 9 ++++++--- .../service/impl/YxStoreProductServiceImpl.java | 1 + 8 files changed, 33 insertions(+), 9 deletions(-) diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java index 90049952..fa84a928 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java @@ -132,7 +132,7 @@ public class UserBillController extends BaseController { return ApiResult.fail("未配置h5地址"); } String apiUrl = systemConfigService.getData("api_url"); - if(StrUtil.isEmpty(siteUrl)){ + if(StrUtil.isEmpty(apiUrl)){ return ApiResult.fail("未配置api地址"); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreCategoryRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreCategoryRepository.java index 0e786f55..806f5014 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreCategoryRepository.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreCategoryRepository.java @@ -13,4 +13,6 @@ public interface YxStoreCategoryRepository extends JpaRepository findByCateId(String cateId); } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreCategoryController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreCategoryController.java index 52d22911..f4e3d1f7 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreCategoryController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreCategoryController.java @@ -87,9 +87,12 @@ public class StoreCategoryController { @ApiOperation(value = "删除商品分类") @DeleteMapping(value = "/yxStoreCategory/{id}") @PreAuthorize("@el.check('admin','YXSTORECATEGORY_ALL','YXSTORECATEGORY_DELETE')") - public ResponseEntity delete(@PathVariable Integer id){ + public ResponseEntity delete(@PathVariable String id){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxStoreCategoryService.delete(id); + String[] ids = id.split(","); + for (String newId: ids) { + yxStoreCategoryService.delete(Integer.valueOf(newId)); + } return new ResponseEntity(HttpStatus.OK); } } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductController.java index 1beecaab..5e2e5bc1 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductController.java @@ -96,7 +96,6 @@ public class StoreProductController { public ResponseEntity onSale(@PathVariable Integer id,@RequestBody String jsonStr){ JSONObject jsonObject = JSON.parseObject(jsonStr); int status = Integer.valueOf(jsonObject.get("status").toString()); - //System.out.println(status); yxStoreProductService.onSale(id,status); return new ResponseEntity(HttpStatus.OK); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java index a6543721..47eebdfb 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java @@ -1,8 +1,11 @@ package co.yixiang.modules.shop.service.impl; import cn.hutool.core.util.ObjectUtil; +import co.yixiang.exception.BadRequestException; import co.yixiang.modules.shop.domain.YxStoreCategory; +import co.yixiang.modules.shop.domain.YxStoreProduct; import co.yixiang.modules.shop.repository.YxStoreCategoryRepository; +import co.yixiang.modules.shop.repository.YxStoreProductRepository; import co.yixiang.modules.shop.service.YxStoreCategoryService; import co.yixiang.modules.shop.service.dto.YxStoreCategoryDTO; import co.yixiang.modules.shop.service.dto.YxStoreCategoryQueryCriteria; @@ -31,13 +34,16 @@ import java.util.stream.Collectors; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxStoreCategoryServiceImpl implements YxStoreCategoryService { - private final YxStoreCategoryRepository yxStoreCategoryRepository; + private final YxStoreProductRepository yxStoreProductRepository; private final YxStoreCategoryMapper yxStoreCategoryMapper; - public YxStoreCategoryServiceImpl(YxStoreCategoryRepository yxStoreCategoryRepository, YxStoreCategoryMapper yxStoreCategoryMapper) { + public YxStoreCategoryServiceImpl(YxStoreCategoryRepository yxStoreCategoryRepository, + YxStoreProductRepository yxStoreProductRepository, + YxStoreCategoryMapper yxStoreCategoryMapper) { this.yxStoreCategoryRepository = yxStoreCategoryRepository; + this.yxStoreProductRepository = yxStoreProductRepository; this.yxStoreCategoryMapper = yxStoreCategoryMapper; } @@ -92,6 +98,12 @@ public class YxStoreCategoryServiceImpl implements YxStoreCategoryService { @Override @Transactional(rollbackFor = Exception.class) public void delete(Integer id) { + YxStoreCategory storeCategory = yxStoreCategoryRepository.findByPid(id); + if(storeCategory != null) throw new BadRequestException("请先删除子类"); + + List storeProduct = yxStoreProductRepository.findByCateId(String.valueOf(id)); + if(!storeProduct.isEmpty()) throw new BadRequestException("此分类下有商品,不能删除"); + yxStoreCategoryRepository.deleteById(id); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java index a50487dc..b173e05e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java @@ -49,10 +49,13 @@ public class YxStoreProductReplyServiceImpl implements YxStoreProductReplyServic ,pageable); List productReplyDTOS = new ArrayList<>(); for (YxStoreProductReply reply : page.getContent()) { - YxStoreProductReplyDTO productReplyDTO = yxStoreProductReplyMapper.toDto(reply); - productReplyDTO.setUsername(userService.findById(reply.getUid()).getAccount()); - productReplyDTO.setProductName(productService.findById(reply.getProductId()).getStoreName()); + try{ + productReplyDTO.setUsername(userService.findById(reply.getUid()).getAccount()); + productReplyDTO.setProductName(productService.findById(reply.getProductId()).getStoreName()); + }catch (Exception e){ + continue; + } productReplyDTOS.add(productReplyDTO); } Map map = new LinkedHashMap<>(2); diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java index 8bbe0946..0d4330b3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java @@ -119,6 +119,7 @@ public class YxStoreProductServiceImpl implements YxStoreProductService { @Transactional(rollbackFor = Exception.class) public void recovery(Integer id) { yxStoreProductRepository.updateDel(0,id); + yxStoreProductRepository.updateOnsale(0,id); } @Override