Merge remote-tracking branch 'origin/order_received_statistics' into order_received_statistics

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -920,4 +920,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         return mapper.selectAllRentVehicleOrder(paramMap);
     }
 
+    public List<OrderPageVO> selectAllCountOrder(Map<String, Object> paramMap) {
+        return mapper.selectAllCountOrder(paramMap);
+    }
+
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleServiceStatisticsBiz.java

@@ -51,7 +51,7 @@ public class OrderVehicleServiceStatisticsBiz extends BaseBiz<OrderVehicleServic
 		param.put("startTime", OrderDateUtils.getStartOfDay(nowTime));
 		param.put("endTime", OrderDateUtils.getEndOfDay(nowTime));
 		param.put("status", 1);
-		List<OrderPageVO> orderPageVOS = baseOrderBiz.selectAllRentVehicleOrder(param);
+		List<OrderPageVO> orderPageVOS = baseOrderBiz.selectAllCountOrder(param);
 		if (orderPageVOS != null && orderPageVOS.size() > 0) {
 			log.info(timeStr + "所有订单： list = {}", orderPageVOS);
 			orderPageVOS.parallelStream().forEach(result -> {
@@ -88,6 +88,8 @@ public class OrderVehicleServiceStatisticsBiz extends BaseBiz<OrderVehicleServic
 							}
 						} else if (bookDays - actualUsedDays < 0) { //如果实际使用时间大于预定时间，还车时租车天数为多出的天数
 							dateNumMap.put(timeStr, dateNumMap.getOrDefault(timeStr, 0) + (actualUsedDays - bookDays));
+						} else if (bookDays - actualUsedDays > 0){
+							dateNumMap.put(timeStr, dateNumMap.getOrDefault(timeStr, 0) + actualUsedDays);
 						}
 					}
 					mapMap.put(result.getOrderRentVehicleDetail().getStartCompanyId(), dateNumMap);

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java

@@ -10,7 +10,6 @@ import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -35,7 +34,7 @@ public interface BaseOrderMapper extends Mapper<BaseOrder> {
 	public OrderPageVO getOrderDetail(String no);
 
 	public List<OrderPageVO> selectAllRentVehicleOrder(Map<String, Object> paramMap);
-
+	public List<OrderPageVO> selectAllCountOrder(Map<String, Object> paramMap);
 	public List<OrderPageVO> selectAllTourOrder(Map<String, Object> paramMap);
 
 	List<MemberOrderBo> findMemberOrders(MemberOrderFindDTO memberOrderFindDTO);

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -315,6 +315,33 @@
         order by b.crt_time desc
     </select>
 
+    <select id="selectAllCountOrder" parameterType="Map" resultMap="orderPageMap">
+        SELECT bo.* from base_order bo
+        LEFT JOIN order_rent_vehicle_detail orv on bo.id = orv.order_id
+        where bo.type = 1 and (bo.status >= 4 or bo.status = -1)
+        and
+        (
+        (
+        orv.start_time &gt; #{startTime}
+        AND orv.start_time &lt; #{startTime}
+        AND orv.end_time &gt; #{endTime}
+        )
+        OR (
+        orv.start_time &lt; #{startTime}
+        AND orv.end_time &gt; #{endTime}
+        )
+        OR (
+        orv.start_time &lt; #{startTime}
+        AND orv.end_time &gt; #{endTime}
+        AND orv.end_time &lt; #{endTime}
+        )
+        OR (
+        orv.start_time &gt; #{startTime}
+        AND orv.end_time &lt; #{endTime}
+        )
+        )
+    </select>
+
     <select id="getOrderDetail" parameterType="java.lang.String" resultMap="orderPageMap">
         select *
         from base_order
@@ -325,7 +352,7 @@
         select b.*
         from base_order b
         LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
-        where b.type = 2 and b.status &gt;= 4
+        where b.type = 1 and (b.status &gt;= 4 or b.status = -1)
         <if test="startTime != null and status == 1">
             and r.start_time between #{startTime} and #{endTime}
         </if>