Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/OrderPriceVO.java

@@ -13,4 +13,6 @@ public class OrderPriceVO {
     public BigDecimal goodsAmount;
     @ApiModelProperty(value = "实际价格")
     public BigDecimal realAmount;
+    @ApiModelProperty(value = "优惠券扣除的费用")
+    public BigDecimal couponAmount;
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/RentVehiclePriceVO.java

@@ -33,6 +33,4 @@ public class RentVehiclePriceVO extends OrderPriceVO{
     BigDecimal damageSafePrice;
     @ApiModelProperty(value = "费用详情")
     private String costDetail;
-    @ApiModelProperty(value = "优惠券扣除的费用")
-    private BigDecimal couponAmount;
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/TourPriceVO.java

@@ -53,8 +53,4 @@ public class TourPriceVO extends OrderPriceVO{
     //总人数
     @ApiModelProperty(value = "总人数")
     private Integer totalNumber;
-
-    //优惠券
-    @ApiModelProperty(value = "优惠券扣除的费用")
-    private BigDecimal couponAmount;
 }

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

@@ -169,6 +169,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
         opv.setOrderAmount(orderAmount);
         opv.setGoodsAmount(goodsAmount);
         opv.setRealAmount(realAmount);
+        opv.setCouponAmount(couponAmount);
 
         return opv;
     }

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

@@ -2,21 +2,21 @@
 <configuration debug="false">
 	<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径 -->
 	<property name="LOG_HOME" value="${system.log.path:-logs}"/>
-	
-    <!-- 彩色日志依赖的渲染类 -->
-    <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="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <!--1. 输出到控制台-->
-        <encoder>
-            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
-            <charset>UTF-8</charset> <!-- 设置字符集 -->
-        </encoder>
-    </appender>
-	
+
+	<!-- 彩色日志依赖的渲染类 -->
+	<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="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <!--1. 输出到控制台-->
+		<encoder>
+			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+			<charset>UTF-8</charset> <!-- 设置字符集 -->
+		</encoder>
+	</appender>
+
 	<appender name="SYSTEM_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"><!-- 按照每天生成日志文件 -->
 		<filter class="com.xxfc.platform.universal.filter.DenyFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -27,7 +27,7 @@
 			<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{50} - %msg%n</pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
 		</encoder>
 	</appender>
-	
+
 	<appender name="WEB_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"><!-- 按照每天生成日志文件 -->
 		<filter class="com.xxfc.platform.universal.filter.AcceptFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -38,18 +38,18 @@
 			<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{50} - %msg%n</pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
 		</encoder>
 	</appender>
-	
+
 	<appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-       <destination>192.168.0.181:5044</destination>
-       
-       <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" >
-            <!--"appname":"springboot21-log-elk" 的作用是指定创建索引的名字时用，并且在生成的文档中会多了这个字段
-             	在logstashindex中引入    index => "%{[appname]}-%{+YYYY.MM.dd}"-->
-             
-           <customFields>{"appName":"elk-log-service-operate-dev"}</customFields>
-       </encoder>
+		<destination>192.168.0.181:5044</destination>
+
+		<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" >
+			<!--"appname":"springboot21-log-elk" 的作用是指定创建索引的名字时用，并且在生成的文档中会多了这个字段
+                 在logstashindex中引入    index => "%{[appname]}-%{+YYYY.MM.dd}"-->
+
+			<customFields>{"appName":"elk-log-service-operate-dev"}</customFields>
+		</encoder>
 	</appender>
-    
+
 	<root level="INFO">
 		<appender-ref ref="STDOUT" />
 	</root>