Merge branch 'master-modify-cutAmount' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -417,6 +417,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             put("children", children);
             put("vehicleAmount", vo.getVehicleAmount());
             put("realAmount", vo.getRealAmount());
+            put("paramJson", vo.getParamJson());
         }}));
         String result = orderTemplateBiz.result(template, Dict.parse(vo));
         vo.setCostDetail(result);

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderTourService.java

@@ -314,6 +314,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
         OrderTemplate template = orderTemplateBiz.selectByCode(OrderCostEnum.RENT_VEHICLE.getCode());
         template.setTemplate(orderTemplateBiz.result(template.getTemplate(), new HashMap(){{
             put("children", children);
+            put("paramJson", vo.getParamJson());
         }}));
         String result = orderTemplateBiz.result(template, Dict.parse(vo));
         vo.setCostDetail(result);

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

@@ -181,7 +181,7 @@
         select b.*
         from base_order b
         LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
-        where b.type = 1
+        where b.type = 1 and r.end_time >= now()
         <if test="userIds != null and userIds.size > 0">
             and b.user_id in
             <foreach collection="userIds" item="id" open="(" separator="," close=")">