From d941ea49d35a8ae834fa33ad441e8a1c2d564950 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 2 Jul 2024 19:44:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ArtificerServiceImpl.java | 4 ++ .../controller/app/AppGoodsController.java | 6 +++ .../shopping/service/GoodsService.java | 2 + .../service/impl/SelfGoodsServiceImpl.java | 45 +++++++++++++++++++ 4 files changed, 57 insertions(+) diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java index 6277e26..7f3a2c2 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java @@ -667,6 +667,10 @@ public class ArtificerServiceImpl extends ServiceImpl i divide1 = divide1.multiply(cy100); earnings = divide1.intValue()+"%"; System.out.println(currentPeriodOrdersSumBig+"=========="+c+"---"+divide1); + }else if(orderType == 4){//业绩 + ordersIPage = ordersDao.getDangqiList(pages, userId,isSfwc,startTime,endTime); + int yeji = ordersDao.selectOrdersArtificerIntegralEarnings(userId, endTime, startTime); + earnings = yeji+""; } map.put("data",new PageUtils(ordersIPage)); diff --git a/src/main/java/com/sqx/modules/shopping/controller/app/AppGoodsController.java b/src/main/java/com/sqx/modules/shopping/controller/app/AppGoodsController.java index 25d4e61..95716a6 100644 --- a/src/main/java/com/sqx/modules/shopping/controller/app/AppGoodsController.java +++ b/src/main/java/com/sqx/modules/shopping/controller/app/AppGoodsController.java @@ -144,5 +144,11 @@ public class AppGoodsController { return service.findAttrValue(goodsId); } + @GetMapping("/wlcglist") + @ApiOperation("物料采购") + public Result wlcglist(Integer page, Integer size, + @ApiParam("排序字段 综合createAt 销量sales 佣金比例commissionPrice 超低价price")@RequestParam(required = false) String sort) { + return service.wlcglist(page, size, sort); + } } diff --git a/src/main/java/com/sqx/modules/shopping/service/GoodsService.java b/src/main/java/com/sqx/modules/shopping/service/GoodsService.java index 923bb39..c32fe66 100644 --- a/src/main/java/com/sqx/modules/shopping/service/GoodsService.java +++ b/src/main/java/com/sqx/modules/shopping/service/GoodsService.java @@ -79,4 +79,6 @@ public interface GoodsService { Result selectListByType(String title, String type, Integer status, Integer isJiFenGoods); + + Result wlcglist(Integer page, Integer size, String sort); } diff --git a/src/main/java/com/sqx/modules/shopping/service/impl/SelfGoodsServiceImpl.java b/src/main/java/com/sqx/modules/shopping/service/impl/SelfGoodsServiceImpl.java index 979f90b..1b43a76 100644 --- a/src/main/java/com/sqx/modules/shopping/service/impl/SelfGoodsServiceImpl.java +++ b/src/main/java/com/sqx/modules/shopping/service/impl/SelfGoodsServiceImpl.java @@ -5,6 +5,7 @@ import com.sqx.modules.shopping.controller.SkuUtil; import com.sqx.modules.shopping.dao.*; import com.sqx.modules.shopping.entity.*; import com.sqx.modules.shopping.service.GoodsService; +import com.sqx.modules.shopping.service.GoodsTypeService; import com.sqx.modules.shopping.service.SelfGoodsAttrService; import com.sqx.modules.shopping.utils.DateUtil; import com.sqx.modules.shopping.utils.Result; @@ -48,6 +49,9 @@ public class SelfGoodsServiceImpl implements GoodsService { @Autowired private SelfGoodsBrandJpaRepository selfGoodsBrandJpaRepository; + @Autowired + private GoodsTypeService goodsTypeService; + /** * 后台管理商品列表、创建时间排序 * @param page 页数 @@ -176,6 +180,47 @@ public class SelfGoodsServiceImpl implements GoodsService { } return ResultUtil.success(all); } + + @Override + public Result wlcglist(Integer page, Integer size, String sort) { + //只查询类型是物料包的商品 + String pTypeId = "56"; + List goodsTypeList; + if(StringUtils.isNotBlank(pTypeId)){ + Specification goodsTypeQc = (root, criteriaQuery, criteriaBuilder) -> { + List predicateList = new ArrayList<>(); + predicateList.add(criteriaBuilder.or(criteriaBuilder.equal(root.get("parentId"), pTypeId),criteriaBuilder.equal(root.get("id"), pTypeId))); + return criteriaBuilder.and(predicateList.toArray(new Predicate[0])); + }; + goodsTypeList = goodsJpaTypeRepository.findAll(goodsTypeQc); + } else { + goodsTypeList = null; + } + //按照时间排序 + Pageable pageable; + if(size == -1){ + pageable = PageRequest.of(page, Integer.MAX_VALUE, Sort.by(new Sort.Order(Sort.Direction.DESC, "createAt"))); + } else { + pageable = PageRequest.of(page, size, Sort.by(new Sort.Order(Sort.Direction.DESC, "createAt"))); + } + //构造自定义查询条件 + Specification queryCondition = (root, criteriaQuery, criteriaBuilder) -> { + List predicateList = new ArrayList<>(); + if(StringUtils.isNotBlank(pTypeId)) { + //goodsTypeList + CriteriaBuilder.In in = criteriaBuilder.in(root.get("typeId")); + if(goodsTypeList != null && !goodsTypeList.isEmpty()) { + goodsTypeList.forEach(x -> in.value(x.getId())); + } + predicateList.add(in); + } + return criteriaBuilder.and(predicateList.toArray(new Predicate[0])); + }; + //处理数据：商品分类 + Page all = jpaRepository.findAll(queryCondition, pageable); + return ResultUtil.success(all); + } + //虚拟商品列表 @Override public Result goodsVirtualList(Integer page, Integer size, String title, String type, Integer status, Integer isExpress, Integer isJiFenGoods) {