Merge branch 'udpate' into develop

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 {

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>

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>

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: 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: red" ></span>
                                 <span th:if="${partner.compare.direction==0}" th:text="${partner.compare.value}"></span>
                             </div>
                         </div>