From 002c70cfe6807a01e9c217e8a933c32426feee22 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 18 Mar 2019 15:26:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[log=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:C=E7=AB=AFlog=E6=97=A5=E6=9C=9F=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkCApi/src/main/resources/logback-spring.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 From 23d2f813905557bcc7b7daef4a65efb85aecf535 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 18 Mar 2019 17:36:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[log=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:log=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkAdmin/src/main/resources/logback-spring.xml | 12 ++++++------ mallinkBApi/src/main/resources/logback-spring.xml | 12 ++++++------ .../src/main/resources/logback-spring.xml | 12 ++++++------ .../src/main/resources/logback-spring.xml | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) 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/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 From e403934c11ded6a732a66def0a7863ccbfea9768 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 18 Mar 2019 19:07:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/vo/WxCouponOrderBVo.java | 13 +++++++++++++ .../main/resources/mapper/WxCouponOrderMapper.xml | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) 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}