Merge remote-tracking branch 'origin/master'

pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml

@@ -52,13 +52,14 @@
     <select id="productTotal" resultType="com.bsd.pjcloud.hard.api.vo.order.HardCanteenProductTotalVo">
         select DATE_FORMAT(a.create_time, '%Y-%m-%d') as createTime,
         o.hour_type,
-        COUNT(0) as timeCount,
         SUM(a.product_count) as payCount,
         SUM(a.total_price) as totalPrice,
+        count(distinct o.id) as timeCount,
         count(distinct o.user_id) as payUserCount
         from hard_car a
         inner join hard_parent_car p on a.parent_car_id = p.id and p.del_flag = '0'
-        inner join hard_order o on o.parent_car_id = p.id and o.del_flag = '0' and o.hour_type is not null
+        inner join hard_order o on o.parent_car_id = p.id and o.del_flag = '0' and o.hour_type is not null and
+        o.hour_type not in ('-1')
         <where>
             a.del_flag = 0
             <if test="dto.createTimeList != null and dto.createTimeList.length == 2">