Commit 3f7e99c938cef665829fd192227d0f3b13e710ac

Authored by YunaiV
1 parent f9a50116

【修复】商城系统:管理后台的商城订单统计数据有问题

yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/mysql/trade/TradeOrderStatisticsMapper.java
@@ -58,8 +58,8 @@ public interface TradeOrderStatisticsMapper extends BaseMapperX<TradeStatisticsD @@ -58,8 +58,8 @@ public interface TradeOrderStatisticsMapper extends BaseMapperX<TradeStatisticsD
58 58
59 Long selectCountByStatusAndDeliveryType(@Param("status") Integer status, @Param("deliveryType") Integer deliveryType); 59 Long selectCountByStatusAndDeliveryType(@Param("status") Integer status, @Param("deliveryType") Integer deliveryType);
60 60
61 - TradeOrderSummaryRespVO selectPaySummaryByStatusAndPayTimeBetween(@Param("status") Integer status,  
62 - @Param("beginTime") LocalDateTime beginTime,  
63 - @Param("endTime") LocalDateTime endTime); 61 + TradeOrderSummaryRespVO selectPaySummaryByPayStatusAndPayTimeBetween(@Param("payStatus") Integer payStatus,
  62 + @Param("beginTime") LocalDateTime beginTime,
  63 + @Param("endTime") LocalDateTime endTime);
64 64
65 } 65 }
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/TradeOrderStatisticsServiceImpl.java
@@ -75,8 +75,8 @@ public class TradeOrderStatisticsServiceImpl implements TradeOrderStatisticsServ @@ -75,8 +75,8 @@ public class TradeOrderStatisticsServiceImpl implements TradeOrderStatisticsServ
75 75
76 private TradeOrderSummaryRespVO getPayPriceSummary(LocalDateTime date) { 76 private TradeOrderSummaryRespVO getPayPriceSummary(LocalDateTime date) {
77 LocalDateTime beginTime = LocalDateTimeUtil.beginOfDay(date); 77 LocalDateTime beginTime = LocalDateTimeUtil.beginOfDay(date);
78 - LocalDateTime endTime = LocalDateTimeUtil.beginOfDay(date);  
79 - return tradeOrderStatisticsMapper.selectPaySummaryByStatusAndPayTimeBetween( 78 + LocalDateTime endTime = LocalDateTimeUtil.endOfDay(date);
  79 + return tradeOrderStatisticsMapper.selectPaySummaryByPayStatusAndPayTimeBetween(
80 PayOrderStatusEnum.SUCCESS.getStatus(), beginTime, endTime); 80 PayOrderStatusEnum.SUCCESS.getStatus(), beginTime, endTime);
81 } 81 }
82 82
yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/trade/TradeOrderStatisticsMapper.xml
@@ -93,12 +93,12 @@ @@ -93,12 +93,12 @@
93 AND deleted = FALSE 93 AND deleted = FALSE
94 </select> 94 </select>
95 95
96 - <select id="selectPaySummaryByStatusAndPayTimeBetween" 96 + <select id="selectPaySummaryByPayStatusAndPayTimeBetween"
97 resultType="cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeOrderSummaryRespVO"> 97 resultType="cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeOrderSummaryRespVO">
98 SELECT IFNULL(SUM(pay_price), 0) AS orderPayPrice, 98 SELECT IFNULL(SUM(pay_price), 0) AS orderPayPrice,
99 COUNT(1) AS orderPayCount 99 COUNT(1) AS orderPayCount
100 FROM trade_order 100 FROM trade_order
101 - WHERE status = #{status} 101 + WHERE pay_status = #{payStatus}
102 AND pay_time BETWEEN #{beginTime} AND #{endTime} 102 AND pay_time BETWEEN #{beginTime} AND #{endTime}
103 AND deleted = FALSE 103 AND deleted = FALSE
104 </select> 104 </select>