From 846cbef3daa413a787a2101e843fd0363340fe55 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 11 Oct 2024 09:44:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=EF=BC=8C=E7=BB=9F=E8=AE=A1=20=E5=85=B3=E4=BA=8E=E5=AE=A2?= =?UTF-8?q?=E5=9D=90=E8=B4=B9=E6=B2=A1=E6=9C=89=E8=A7=84=E6=A0=BC=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/shop/TbShopUnitController.java | 22 +------- .../service/impl/SummaryServiceImpl.java | 20 ++------ .../impl/shopimpl/TbShopUnitServiceImpl.java | 50 ++++++++++--------- 3 files changed, 33 insertions(+), 59 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUnitController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUnitController.java index b318b2ba..449a9474 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUnitController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUnitController.java @@ -1,18 +1,3 @@ -/* -* Copyright 2019-2020 Zheng Jie -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ package cn.ysk.cashier.controller.shop; import cn.ysk.cashier.annotation.Log; @@ -30,11 +15,6 @@ import io.swagger.annotations.*; import java.io.IOException; import javax.servlet.http.HttpServletResponse; -/** -* @website https://eladmin.vip -* @author lyf -* @date 2024-01-02 -**/ @RestController @RequiredArgsConstructor @Api(tags = "/shop/unit管理") @@ -59,7 +39,7 @@ public class TbShopUnitController { @PostMapping @Log("新增单位:#resources.name") @ApiOperation("新增/shop/unit") - public ResponseEntity createTbShopUnit(@Validated @RequestBody TbShopUnit resources)throws Exception{ + public ResponseEntity createTbShopUnit(@Validated @RequestBody TbShopUnit resources){ return new ResponseEntity<>(tbShopUnitService.create(resources),HttpStatus.CREATED); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java index 9d56f52a..6255e0cb 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java @@ -8,9 +8,6 @@ import cn.ysk.cashier.enums.PayTypeEnum; import cn.ysk.cashier.exception.BadRequestException; import cn.ysk.cashier.mybatis.mapper.TbShopUserFlowMapper; import cn.ysk.cashier.mybatis.service.TbShopUserFlowService; -import cn.ysk.cashier.repository.ShopUserDutyDetailRepository; -import cn.ysk.cashier.repository.ShopUserDutyRepository; -import cn.ysk.cashier.repository.TbTokenRepository; import cn.ysk.cashier.repository.order.TbOrderDetailRepository; import cn.ysk.cashier.repository.order.TbOrderInfoRepository; import cn.ysk.cashier.repository.shop.TbShopTableRepository; @@ -45,10 +42,6 @@ import java.util.stream.Collectors; @RequiredArgsConstructor @Slf4j public class SummaryServiceImpl implements SummaryService { - @Resource - private ShopUserDutyRepository shopUserDutyRepository; - @Resource - private ShopUserDutyDetailRepository shopUserDutyDetailRepository; @Resource private TbShopUserRepository tbShopUserRepository; @Resource @@ -56,9 +49,6 @@ public class SummaryServiceImpl implements SummaryService { @Resource private TbOrderDetailRepository detailRepository; - @Resource - private TbTokenRepository tbTokenRepository; - @Autowired private TbShopUserFlowMapper tbShopUserFlowMapper; @Resource @@ -186,7 +176,7 @@ public class SummaryServiceImpl implements SummaryService { payCountVos.add(new TbOrderPayCountVo("https://cashier-oss.oss-cn-beijing.aliyuncs.com/static/vipIn.png","充值","1",BigDecimal.ZERO)); // payCountVos.add(new TbOrderPayCountVo("","会员支付","1",BigDecimal.ZERO)); return payCountVos; - }; + } @@ -278,8 +268,8 @@ public class SummaryServiceImpl implements SummaryService { @Override public Map selectSummaryPayType(Integer shopId, Integer day) { - Long startTime; - Long endTime; + long startTime; + long endTime; if (day == 7) { startTime = DateUtil.getSevenDaysAgoInMilliseconds(); endTime = DateUtil.getTodayEndTimestamp(); @@ -361,13 +351,13 @@ public class SummaryServiceImpl implements SummaryService { List products = detailRepository.queryTbOrderSalesCountByProduct(Integer.valueOf(summaryDto.getShopId()), summaryDto.getCateId(), summaryDto.getProName(), summaryDto.getStartTime(), summaryDto.getEndTime()); for (TbOrderSalesCountByDayV2Vo product : products) { - if(product.getTypeEnum().equals("sku")){ + if("sku".equals(product.getTypeEnum())){ List skus = detailRepository.queryTbOrderSalesCountBySku(Integer.valueOf(summaryDto.getShopId()), product.getProductId(), summaryDto.getStartTime(), summaryDto.getEndTime()); product.setSkus(skus); } } for (TbOrderSalesCountByDayV2Vo product : products) { - if(product.getTypeEnum().equals("sku")){ + if("sku".equals(product.getTypeEnum())){ for (TbOrderSalesCountByDayV2Vo skus : product.getSkus()) { Map map = new LinkedHashMap<>(); map.put("商品分类", product.getCateName()); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUnitServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUnitServiceImpl.java index 276b337a..d86d7deb 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUnitServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUnitServiceImpl.java @@ -15,38 +15,34 @@ */ package cn.ysk.cashier.service.impl.shopimpl; -import cn.ysk.cashier.exception.NewBadRequestException; -import cn.ysk.cashier.pojo.shop.TbShopUnit; -import cn.ysk.cashier.utils.ValidationUtil; -import cn.ysk.cashier.utils.FileUtil; -import lombok.RequiredArgsConstructor; -import cn.ysk.cashier.repository.shop.TbShopUnitRepository; -import cn.ysk.cashier.service.shop.TbShopUnitService; import cn.ysk.cashier.dto.shop.TbShopUnitDto; import cn.ysk.cashier.dto.shop.TbShopUnitQueryCriteria; +import cn.ysk.cashier.exception.NewBadRequestException; import cn.ysk.cashier.mapper.shop.TbShopUnitMapper; +import cn.ysk.cashier.pojo.shop.TbShopUnit; +import cn.ysk.cashier.repository.shop.TbShopUnitRepository; +import cn.ysk.cashier.service.shop.TbShopUnitService; +import cn.ysk.cashier.utils.FileUtil; +import cn.ysk.cashier.utils.PageUtil; +import cn.ysk.cashier.utils.QueryHelp; +import cn.ysk.cashier.utils.ValidationUtil; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import cn.ysk.cashier.utils.PageUtil; -import cn.ysk.cashier.utils.QueryHelp; -import java.time.Instant; -import java.util.List; -import java.util.Map; -import java.io.IOException; +import javax.persistence.criteria.Predicate; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.time.Instant; import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; -/** -* @website https://eladmin.vip -* @description 服务实现 -* @author lyf -* @date 2024-01-02 -**/ @Service @RequiredArgsConstructor public class TbShopUnitServiceImpl implements TbShopUnitService { @@ -55,8 +51,16 @@ public class TbShopUnitServiceImpl implements TbShopUnitService { private final TbShopUnitMapper tbShopUnitMapper; @Override - public Map queryAll(TbShopUnitQueryCriteria criteria, Pageable pageable){ - Page page = tbShopUnitRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); + public Map queryAll(TbShopUnitQueryCriteria criteria, Pageable pageable) { + Page page = tbShopUnitRepository.findAll((root, criteriaQuery, criteriaBuilder) -> { + Predicate predicate = QueryHelp.getPredicate(root, null, criteriaBuilder); + predicate = criteriaBuilder.or(predicate, criteriaBuilder.equal(root.get("shopId"), 1)); + predicate = criteriaBuilder.and(predicate, criteriaBuilder.equal(root.get("shopId"), criteria.getShopId())); + if(StringUtils.isNotBlank(criteria.getName())){ + predicate = criteriaBuilder.and(predicate, criteriaBuilder.like(root.get("name"), criteria.getName())); + } + return predicate; + }, pageable); return PageUtil.toPage(page.map(tbShopUnitMapper::toDto)); }