developrelease_toaliyun_real
| @@ -5,7 +5,7 @@ | |||||
| <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | ||||
| <encoder> | <encoder> | ||||
| <Pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] --%mdc{client}%msg%n</Pattern> | |||||
| <Pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n</Pattern> | |||||
| </encoder> | </encoder> | ||||
| </appender> | </appender> | ||||
| @@ -16,7 +16,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| </appender> | </appender> | ||||
| @@ -27,7 +27,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>INFO</level> | <level>INFO</level> | ||||
| @@ -43,7 +43,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>DEBUG</level> | <level>DEBUG</level> | ||||
| @@ -60,7 +60,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>WARN</level> | <level>WARN</level> | ||||
| @@ -78,7 +78,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>ERROR</level> | <level>ERROR</level> | ||||
| @@ -5,7 +5,7 @@ | |||||
| <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | ||||
| <encoder> | <encoder> | ||||
| <Pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] --%mdc{client}%msg%n</Pattern> | |||||
| <Pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n</Pattern> | |||||
| </encoder> | </encoder> | ||||
| </appender> | </appender> | ||||
| @@ -16,7 +16,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| </appender> | </appender> | ||||
| @@ -27,7 +27,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>INFO</level> | <level>INFO</level> | ||||
| @@ -43,7 +43,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>DEBUG</level> | <level>DEBUG</level> | ||||
| @@ -60,7 +60,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>WARN</level> | <level>WARN</level> | ||||
| @@ -78,7 +78,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>ERROR</level> | <level>ERROR</level> | ||||
| @@ -5,7 +5,7 @@ | |||||
| <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | ||||
| <encoder> | <encoder> | ||||
| <Pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] --%mdc{client}%msg%n</Pattern> | |||||
| <Pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n</Pattern> | |||||
| </encoder> | </encoder> | ||||
| </appender> | </appender> | ||||
| @@ -16,7 +16,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| </appender> | </appender> | ||||
| @@ -27,7 +27,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>INFO</level> | <level>INFO</level> | ||||
| @@ -43,7 +43,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>DEBUG</level> | <level>DEBUG</level> | ||||
| @@ -60,7 +60,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>WARN</level> | <level>WARN</level> | ||||
| @@ -78,7 +78,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>ERROR</level> | <level>ERROR</level> | ||||
| @@ -5,7 +5,7 @@ | |||||
| <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | ||||
| <encoder> | <encoder> | ||||
| <Pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] --%mdc{client}%msg%n</Pattern> | |||||
| <Pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n</Pattern> | |||||
| </encoder> | </encoder> | ||||
| </appender> | </appender> | ||||
| @@ -16,7 +16,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| </appender> | </appender> | ||||
| @@ -27,7 +27,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>INFO</level> | <level>INFO</level> | ||||
| @@ -43,7 +43,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>DEBUG</level> | <level>DEBUG</level> | ||||
| @@ -60,7 +60,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>WARN</level> | <level>WARN</level> | ||||
| @@ -78,7 +78,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>ERROR</level> | <level>ERROR</level> | ||||
| @@ -5,7 +5,7 @@ | |||||
| <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | ||||
| <encoder> | <encoder> | ||||
| <Pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] --%mdc{client}%msg%n</Pattern> | |||||
| <Pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n</Pattern> | |||||
| </encoder> | </encoder> | ||||
| </appender> | </appender> | ||||
| @@ -16,7 +16,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| </appender> | </appender> | ||||
| @@ -27,7 +27,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>INFO</level> | <level>INFO</level> | ||||
| @@ -43,7 +43,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>DEBUG</level> | <level>DEBUG</level> | ||||
| @@ -60,7 +60,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>WARN</level> | <level>WARN</level> | ||||
| @@ -78,7 +78,7 @@ | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | <maxHistory>180</maxHistory> <!-- 保留180天 --> | ||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||||
| </layout> | </layout> | ||||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | <filter class="ch.qos.logback.classic.filter.LevelFilter"> | ||||
| <level>ERROR</level> | <level>ERROR</level> | ||||
| @@ -119,6 +119,9 @@ public class WxCouponOrderBVo extends WxCouponOrder{ | |||||
| @Transient | @Transient | ||||
| private Long couponId; | private Long couponId; | ||||
| @Transient | |||||
| private Integer couponType; | |||||
| @Override | @Override | ||||
| public Long getCouponId() { | public Long getCouponId() { | ||||
| @@ -130,6 +133,16 @@ public class WxCouponOrderBVo extends WxCouponOrder{ | |||||
| this.couponId = couponId; | this.couponId = couponId; | ||||
| } | } | ||||
| @Override | |||||
| public Integer getCouponType() { | |||||
| return couponType; | |||||
| } | |||||
| @Override | |||||
| public void setCouponType(Integer couponType) { | |||||
| this.couponType = couponType; | |||||
| } | |||||
| public Date getStartDate() { | public Date getStartDate() { | ||||
| return startDate; | return startDate; | ||||
| } | } | ||||
| @@ -326,7 +326,14 @@ | |||||
| and tcm.status = 0) as mc | and tcm.status = 0) as mc | ||||
| from wx_coupon_order tco) com | from wx_coupon_order tco) com | ||||
| where com.tcoid = co.id | where com.tcoid = co.id | ||||
| and co.coupon_type < 100 | |||||
| <choose> | |||||
| <when test=" null != couponType"> | |||||
| and co.coupon_type = #{couponType} | |||||
| </when> | |||||
| <otherwise> | |||||
| and co.coupon_type < 100 | |||||
| </otherwise> | |||||
| </choose> | |||||
| and c.id = co.coupon_id | and c.id = co.coupon_id | ||||
| <if test=" null != tenantId "> | <if test=" null != tenantId "> | ||||
| and co.tenant_id = #{tenantId} | and co.tenant_id = #{tenantId} | ||||