diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java index 3ac0875bb..a4c01cb6d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java @@ -352,7 +352,7 @@ public interface OrderBasicInfoMapper { * @param dto 查询条件 * @return 统计结果 */ - com.jsowell.pile.vo.web.OrderStatisticsVO countBusinessOrderStatistics(QueryOrderDTO dto); + OrderStatisticsVO countBusinessOrderStatistics(QueryOrderDTO dto); List queryRepayOrder(String memberId); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index d38211e1e..7c27d304e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -6325,6 +6325,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { .map(order -> BusinessOrderListVO.builder() .createTime(order.getCreateTime()) .startMode(order.getStartMode()) + .orderCode(order.getOrderCode()) .orderAmount(StringUtils.isNotBlank(order.getOrderAmount()) ? new BigDecimal(order.getOrderAmount()) : BigDecimal.ZERO) .chargingDegree(StringUtils.isNotBlank(order.getChargingDegree()) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessOrderListVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessOrderListVO.java index 0a9310f69..111de2e52 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessOrderListVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessOrderListVO.java @@ -18,6 +18,12 @@ import java.math.BigDecimal; @NoArgsConstructor @Builder public class BusinessOrderListVO { + + /** + * 订单编号 + */ + private String orderCode; + /** * 创建时间 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 13d27e4fd..39674a4d8 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -2070,28 +2070,26 @@ resultType="com.jsowell.pile.vo.web.OrderStatisticsVO"> select COUNT(*) as orderCount, - IFNULL(SUM(t1.order_amount), 0) as orderAmount - from order_basic_info t1 - left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0' - join pile_station_info t3 on t1.station_id = t3.id and t3.del_flag = '0' - where t1.del_flag = '0' + IFNULL(SUM(order_amount), 0) as orderAmount + from order_basic_info + where del_flag = '0' - and t1.order_status = #{orderStatus,jdbcType=VARCHAR} + and order_status = #{orderStatus,jdbcType=VARCHAR} - and t1.merchant_id = #{merchantId,jdbcType=VARCHAR} + and merchant_id = #{merchantId,jdbcType=VARCHAR} - and t1.station_id = #{stationId,jdbcType=VARCHAR} + and station_id = #{stationId,jdbcType=VARCHAR} - and t1.create_time = ]]> #{startTime,jdbcType=VARCHAR} + and create_time = ]]> #{startTime,jdbcType=VARCHAR} - and t1.create_time #{endTime,jdbcType=VARCHAR} + and create_time #{endTime,jdbcType=VARCHAR} - and t1.station_id in + and station_id in #{stationId}