diff --git a/mallinkAdmin/src/main/resources/logback-spring.xml b/mallinkAdmin/src/main/resources/logback-spring.xml
index 0499e2c57..2525413f1 100644
--- a/mallinkAdmin/src/main/resources/logback-spring.xml
+++ b/mallinkAdmin/src/main/resources/logback-spring.xml
@@ -5,7 +5,7 @@
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] --%mdc{client}%msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n
@@ -16,7 +16,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
@@ -27,7 +27,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
INFO
@@ -43,7 +43,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
DEBUG
@@ -60,7 +60,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
WARN
@@ -78,7 +78,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
ERROR
diff --git a/mallinkBApi/src/main/resources/logback-spring.xml b/mallinkBApi/src/main/resources/logback-spring.xml
index 0499e2c57..2525413f1 100644
--- a/mallinkBApi/src/main/resources/logback-spring.xml
+++ b/mallinkBApi/src/main/resources/logback-spring.xml
@@ -5,7 +5,7 @@
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] --%mdc{client}%msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n
@@ -16,7 +16,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
@@ -27,7 +27,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
INFO
@@ -43,7 +43,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
DEBUG
@@ -60,7 +60,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
WARN
@@ -78,7 +78,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
ERROR
diff --git a/mallinkCApi/src/main/resources/logback-spring.xml b/mallinkCApi/src/main/resources/logback-spring.xml
index 0499e2c57..2525413f1 100644
--- a/mallinkCApi/src/main/resources/logback-spring.xml
+++ b/mallinkCApi/src/main/resources/logback-spring.xml
@@ -5,7 +5,7 @@
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] --%mdc{client}%msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n
@@ -16,7 +16,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
@@ -27,7 +27,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
INFO
@@ -43,7 +43,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
DEBUG
@@ -60,7 +60,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
WARN
@@ -78,7 +78,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
ERROR
diff --git a/mallinkMQConsumer/src/main/resources/logback-spring.xml b/mallinkMQConsumer/src/main/resources/logback-spring.xml
index 0499e2c57..2525413f1 100644
--- a/mallinkMQConsumer/src/main/resources/logback-spring.xml
+++ b/mallinkMQConsumer/src/main/resources/logback-spring.xml
@@ -5,7 +5,7 @@
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] --%mdc{client}%msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n
@@ -16,7 +16,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
@@ -27,7 +27,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
INFO
@@ -43,7 +43,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
DEBUG
@@ -60,7 +60,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
WARN
@@ -78,7 +78,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
ERROR
diff --git a/mallinkSchedule/src/main/resources/logback-spring.xml b/mallinkSchedule/src/main/resources/logback-spring.xml
index 0499e2c57..2525413f1 100644
--- a/mallinkSchedule/src/main/resources/logback-spring.xml
+++ b/mallinkSchedule/src/main/resources/logback-spring.xml
@@ -5,7 +5,7 @@
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] --%mdc{client}%msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n
@@ -16,7 +16,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
@@ -27,7 +27,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
INFO
@@ -43,7 +43,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
DEBUG
@@ -60,7 +60,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
WARN
@@ -78,7 +78,7 @@
180
- [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
+ [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n
ERROR
diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
index 7ef6d87de..bcc1a0b91 100644
--- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
+++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
@@ -119,6 +119,9 @@ public class WxCouponOrderBVo extends WxCouponOrder{
@Transient
private Long couponId;
+ @Transient
+ private Integer couponType;
+
@Override
public Long getCouponId() {
@@ -130,6 +133,16 @@ public class WxCouponOrderBVo extends WxCouponOrder{
this.couponId = couponId;
}
+ @Override
+ public Integer getCouponType() {
+ return couponType;
+ }
+
+ @Override
+ public void setCouponType(Integer couponType) {
+ this.couponType = couponType;
+ }
+
public Date getStartDate() {
return startDate;
}
diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
index de03b1fb9..a952b36f4 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
@@ -326,7 +326,14 @@
and tcm.status = 0) as mc
from wx_coupon_order tco) com
where com.tcoid = co.id
- and co.coupon_type < 100
+
+
+ and co.coupon_type = #{couponType}
+
+
+ and co.coupon_type < 100
+
+
and c.id = co.coupon_id
and co.tenant_id = #{tenantId}