From 5ee5ffed59bfd34fe940cd93fa6d2253b2c327bf Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期六, 10 八月 2024 11:44:46 +0800 Subject: [PATCH] 管理后台活动费用统计代码提交 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java index 840f928..17afde1 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java @@ -2,23 +2,32 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ruoyi.account.api.feignClient.AppUserClient; +import com.ruoyi.chargingPile.api.feignClient.ChargingPileClient; +import com.ruoyi.chargingPile.api.model.TChargingPile; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.order.api.model.TChargingOrder; import com.ruoyi.order.api.model.TExchangeOrder; import com.ruoyi.order.api.model.TShoppingOrder; +import com.ruoyi.order.api.query.TActivityStatisticsQuery; +import com.ruoyi.order.api.vo.TActivityStatisticslVO; +import com.ruoyi.order.api.vo.TActivityVO; +import com.ruoyi.order.service.TChargingOrderService; import com.ruoyi.order.service.TExchangeOrderService; import com.ruoyi.order.service.TShoppingOrderService; +import com.ruoyi.order.service.TVipOrderService; +import com.ruoyi.order.service.impl.TChargingOrderServiceImpl; import io.swagger.annotations.Api; import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** * <p> @@ -36,6 +45,33 @@ private TShoppingOrderService tShoppingOrderService; @Autowired private TExchangeOrderService exchangeOrderService; + @Autowired + private TChargingOrderService chargingOrderService; + @Autowired + private TVipOrderService vipOrderService; + @Autowired + private AppUserClient appUserClient; + @Autowired + private ChargingPileClient chargingPileClient; + /** + * 管理后台 活动费用统计 + * @param + * @return + */ + @PostMapping(value = "/activityStatistics") + public R<TActivityVO> activityStatistics(@RequestBody TActivityStatisticsQuery dto) { + if (StringUtils.hasLength(dto.getPhone())){ + // 远程调用查询出符合条件的用户ids + List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData(); + dto.setUserIds(data); + } + if (dto.getSiteId()!=null){ + // 远程调用查询出符合条件的充电桩ids + List<TChargingPile> data = chargingPileClient.getChargingPileBySiteId(dto.getSiteId()).getData(); + dto.setChargingPileIds(data.stream().map(TChargingPile::getId).collect(Collectors.toList())); + } + return R.ok(tShoppingOrderService.activityStatistics(dto)); + } //订单详情 @PostMapping(value = "/detail") -- Gitblit v1.7.1