积分规则列表获取问题

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

@@ -146,7 +146,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
         if(orderPageVo.getStatus() == 4) { //未交车
            List<VehicleUserLicense> vehicleUserLicenses = Lists.newArrayList();
 
-            boolean flag = getTodyTime(orderPageVo.getOrderRentVehicleDetail().getStartTime());
+            boolean flag = getTodayTime(orderPageVo.getOrderRentVehicleDetail().getStartTime());
             if(!flag) {
                 return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
             }
@@ -585,9 +585,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
 //        }
 //    }
 
-    public boolean getTodyTime(Long time) {
+    public boolean getTodayTime(Long time) {
         Long startTime = getDayStart();
-        if(time > startTime && time < startTime + 24 * 60 * 60 * 1000 - 1) {
+        if(time >= startTime && time <= startTime + 24 * 60 * 60 * 1000 - 1) {
             return true;
         }
         return false;

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

@@ -135,16 +135,16 @@
                 and b.name like CONCAT ("%", #{name}, "%")
             </if>
             <if test="startTime != null">
-                and r.start_time between #{startTime} and #{endTime}
-                or t.start_time between #{startTime} and #{endTime}
+                and (r.start_time between #{startTime} and #{endTime}
+                or t.start_time between #{startTime} and #{endTime})
             </if>
             <if test="startCompanyId != null">
-                and r.start_company_id = #{startCompanyId}
-                or t.start_company_id = #{startCompanyId}
+                and ( r.start_company_id = #{startCompanyId}
+                or t.start_company_id = #{startCompanyId})
             </if>
             <if test="startZoneId != null">
-                and r.start_zone_id = #{startZoneId}
-                or t.start_zone_id = #{startZoneId}
+                and (r.start_zone_id = #{startZoneId}
+                or t.start_zone_id = #{startZoneId})
             </if>
         </where>
         order by b.crt_time desc