积分规则列表获取问题

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/IntegralRule.java

@@ -138,6 +138,6 @@ public class IntegralRule{
     private String btnWord;
 
     @Transient
-    private Boolean integralStatus;
+    private Boolean integralStatus = false;
 
 }
\ No newline at end of file

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/IntegralUserStatus.java

+package com.xxfc.platform.activity.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+
+@Table(name = "integral_user_status")
+@Data
+public class IntegralUserStatus {
+    @Id
+    private Integer id;
+
+    @Column(name = "integral_rule_code")
+    private String integralRuleCode;
+
+    @Column(name = "user_id")
+    private Integer userId;
+
+    private Boolean integralStatus;
+
+    private Long crtTime;
+
+    private Long updTime;
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/IntegralUserStatusMapper.java

+package com.xxfc.platform.activity.mapper;
+
+import com.xxfc.platform.activity.entity.IntegralUserStatus;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface IntegralUserStatusMapper extends Mapper<IntegralUserStatus> {
+
+    IntegralUserStatus selectByUserAndCode(IntegralUserStatus integralUserStatus);
+
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/IntegralUserStatusMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xxfc.platform.activity.mapper.IntegralUserStatusMapper" >
+  <resultMap id="BaseResultMap" type="com.xxfc.platform.activity.entity.IntegralUserStatus" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="integral_rule_code" property="integralRuleCode" jdbcType="VARCHAR" />
+    <result column="user_id" property="userId" jdbcType="INTEGER" />
+    <result column="integral_status" property="integralStatus" jdbcType="BIT" />
+  </resultMap>
+
+    <select id="selectByUserAndCode" resultType="com.xxfc.platform.activity.entity.IntegralUserStatus" parameterType="com.xxfc.platform.activity.entity.IntegralUserStatus">
+      select * from integral_user_status
+      where integral_rule_code = #{integralRuleCode} and user_id = #{userId}
+    </select>
+</mapper>
\ No newline at end of file

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

@@ -195,8 +195,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
             if(restResponse.getData() != null) {
                 orderPageVo.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
             }
-        }
-        if(orderPageVo.getOrderTourDetail() != null) {
+        } else if(orderPageVo.getOrderTourDetail() != null) {
             List<Integer> ids = Lists.newArrayList();
             if(orderPageVo.getOrderTourDetail().getTourUserIds().contains(",")) {
                 String[] strings = orderPageVo.getOrderTourDetail().getTourUserIds().split(",");

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -422,10 +422,17 @@ public class VehicleController extends BaseController<VehicleBiz> {
     @IgnoreClientToken
     @IgnoreUserToken
     public ObjectRestResponse<Map<String, Object>> getVehiclePlanList(VehiclePlanDto vehiclePlanDto) {
-            //获取列表
-            PageDataVO<VehicleAndModelInfoVo> pageDataVO = baseBiz.getAllVehicle(vehiclePlanDto);
-            Map<String, Object> map = Maps.newHashMap();
-            map.put("vehicleAndModelInfoVo",pageDataVO);
+        //获取列表
+        PageDataVO<VehicleAndModelInfoVo> pageDataVO = baseBiz.getAllVehicle(vehiclePlanDto);
+        //获取警告信息
+        List<VehicleWarningMsgQueryVo> vehicleWarningMsgs = vehicleWarningMsgBiz.getAllByParam(vehiclePlanDto);
+        //获取统计信息
+        List<VehicleCountVo> vehicleCountVos = baseBiz.countVehicleByParam(vehiclePlanDto);
+        //获取列表
+         Map<String, Object> map = Maps.newHashMap();
+         map.put("vehicleWarningMsgs",vehicleWarningMsgs);
+         map.put("vehicleAndModelInfoVo",pageDataVO);
+        map.put("vehicleCountVos",vehicleCountVos);
         return ObjectRestResponse.succ(map);
     }
 

xx-vehicle/xx-vehicle-server/src/main/resources/logback.xml

@@ -9,14 +9,14 @@
 	<property name="path" value="logs"></property>
 	<property name="maxHistory" value="30"/>
 	<property name="maxFileSize" value="50MB"/>
-
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+	<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+	<property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>debug</level>
-		</filter>
 		<encoder>
-			<pattern>%date %level [%thread] %logger{36} [%file : %line] %msg%n
-			</pattern>
+			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+			<charset>UTF-8</charset> <!-- 设置字符集 -->
 		</encoder>
 	</appender>
 
@@ -32,8 +32,7 @@
 			</timeBasedFileNamingAndTriggeringPolicy>
 		</rollingPolicy>
 		<encoder>
-			<pattern>%date %level [%thread] %logger{36} [%file : %line] %msg%n
-			</pattern>
+			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
 		</encoder>
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
 			<level>DEBUG</level>
@@ -54,8 +53,7 @@
 			</timeBasedFileNamingAndTriggeringPolicy>
 		</rollingPolicy>
 		<encoder>
-			<pattern>%date %level [%thread] %logger{36} [%file : %line] %msg%n
-			</pattern>
+			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
 		</encoder>
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
 			<level>INFO</level>
@@ -76,8 +74,7 @@
 			</timeBasedFileNamingAndTriggeringPolicy>
 		</rollingPolicy>
 		<encoder>
-			<pattern>%date %level [%thread] %logger{36} [%file : %line] %msg%n
-			</pattern>
+			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
 		</encoder>
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
 			<level>WARN</level>
@@ -99,8 +96,7 @@
 			</timeBasedFileNamingAndTriggeringPolicy>
 		</rollingPolicy>
 		<encoder>
-			<pattern>%date %level [%thread] %logger{36} [%file : %line] %msg%n
-			</pattern>
+			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
 		</encoder>
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
 			<level>ERROR</level>