From 5f262bb891bbd864891264d1b1ebd7fd9f80379d Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Sun, 21 Jan 2018 16:32:58 +1100
Subject: [PATCH 1/3] fix

---
 .../management/clearing/core/impl/CleanServiceImpl.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
index e00826762..23056f7e3 100644
--- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
@@ -947,7 +947,14 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
                 return JSON.parseObject(reportItem.getString("result"));
             }
         }
-        return paymentApi.validTransactions(dt, fix);
+        JSONObject report = paymentApi.validTransactions(dt, fix);
+        JSONObject log = new JSONObject();
+        log.put("valid_date", dt);
+        log.put("create_time", new Date());
+        log.put("result", report.toJSONString());
+        validationLogMapper.removeByDate(dt);
+        validationLogMapper.save(log);
+        return report;
     }
 
     private byte[] getZipByteArr(List<JSONObject> fileByteArrWithName) throws IOException {

From d93951a95c8aa1e4c88a2384092fe7165a363c89 Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Sun, 21 Jan 2018 17:03:23 +1100
Subject: [PATCH 2/3] fix

---
 .../manage/mappers/customers/CustomerMembershipMapper.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.xml
index df98c4b89..63477ee9d 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.xml
@@ -54,7 +54,7 @@
         <![CDATA[
        SELECT DISTINCT scr.kanga_openid FROM sys_customer_relation scr, sys_managers sm
        WHERE scr.wechat_openid = sm.wx_openid  AND scr.kanga_openid IS NOT NULL
-       AND sm.role & 10000001 > 0
+       AND sm.role & 10000001 > 0 and sm.is_valid=1
         ]]>
     </select>
 </mapper>
\ No newline at end of file

From ed75226b061cd5d21dbd64e5e76db4e9d84297cb Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Mon, 29 Jan 2018 09:47:16 +0800
Subject: [PATCH 3/3] fixbug

---
 src/main/resources/templates/reports/week_report.html         | 4 ++--
 .../resources/templates/reports/week_report_partners.html     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/reports/week_report.html b/src/main/resources/templates/reports/week_report.html
index 138826f51..2f49bdeed 100644
--- a/src/main/resources/templates/reports/week_report.html
+++ b/src/main/resources/templates/reports/week_report.html
@@ -186,10 +186,10 @@
                                 <div class="weui-cell__bd weui-cell_primary"
                                      th:text="${bd.bd_name}">
                                      <span style="color: green"
-                                           th:if="${bd.compare and $bd.compare.direction>0}"
+                                           th:if="${bd.compare and bd.compare.direction>0}"
                                            th:text="'↑('+${bd.compare.value}+')'"></span>
                                     <span style="color: red"
-                                          th:if="${bd.compare and $bd.compare.direction>0}"
+                                          th:if="${bd.compare and bd.compare.direction>0}"
                                           th:text="'↓('+${bd.compare.value}+')'"></span>
                                 </div>
                                 <div class="weui-cell__ft" th:text="${bd.total}"></div>
diff --git a/src/main/resources/templates/reports/week_report_partners.html b/src/main/resources/templates/reports/week_report_partners.html
index bf801747b..bbf5e4415 100644
--- a/src/main/resources/templates/reports/week_report_partners.html
+++ b/src/main/resources/templates/reports/week_report_partners.html
@@ -36,8 +36,8 @@
                         <div class="weui-cell">
                             <div class="weui-cell__bd weui-cell_primary">较上周比较</div>
                             <div class="weui-cell__ft">
-                                <span th:if="${partner.compare.direction>0}" th:text="'↑'+${$partner.compare.value}" style="color: green"></span>
-                                <span th:if="${partner.compare.direction<0}" th:text="'↓'+${$partner.compare.value}" style="color: red" ></span>
+                                <span th:if="${partner.compare.direction>0}" th:text="'↑'+${partner.compare.value}" style="color: green"></span>
+                                <span th:if="${partner.compare.direction<0}" th:text="'↓'+${partner.compare.value}" style="color: red" ></span>
                                 <span th:if="${partner.compare.direction==0}" th:text="${partner.compare.value}"></span>
                             </div>
                         </div>