Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage

src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java

@@ -78,8 +78,8 @@ public class AppQueryBean {
             }
         }
 
-        params.put("status", status.toString());
-        params.put("channel", channel.toString());
+        params.put("status", status.getStatus());
+        params.put("channel", channel.getChannels());
         if (client_ids != null) {
             params.put("client_ids", client_ids);
         }

src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java

@@ -19,29 +19,24 @@ import au.com.royalpay.payment.tools.env.RequestEnvironment;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
 import au.com.royalpay.payment.tools.utils.PasswordUtils;
-
 import com.alibaba.fastjson.JSONObject;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
-import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafTemplateAvailabilityProvider;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.stereotype.Service;
-import org.springframework.ui.velocity.VelocityEngineUtils;
 import org.springframework.util.Assert;
 import org.thymeleaf.context.Context;
 import org.thymeleaf.spring4.SpringTemplateEngine;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Resource;
-
 /**
  * account service for sign in
  * Created by yixian on 2016-06-29.

src/main/resources/templates/paynotice.html

@@ -103,11 +103,11 @@
         </div>
         <div class="weui_cell_ft" th:text="${order.order_description}"></div>
     </div>
-    <div class="weui_cell" th:if="${order['order_detail']!=null} and ${order.order_detail}!=''">
+    <div class="weui_cell" th:if="${order['order_detail']!=null} and ${order['order_detail']}!=''">
         <div class="weui_cell_bd weui_cell_primary">
             <p>Remark</p>
         </div>
-        <div class="weui_cell_ft" th:text="${order['order_detail']}"></div>
+        <div class="weui_cell_ft" th:utext="${order['order_detail']}"></div>
     </div>
     <div class="weui_cell">
         <div class="weui_cell_bd weui_cell_primary">

src/main/resources/templates/reports/daily_report.html

@@ -131,37 +131,6 @@
                     </div>
                 </div>
             </div>
-            ##
-            <div class="weui-panel">
-                ##
-                <div class="weui-panel__hd">Total</div>
-                ##
-                <div class="weui-panel__ft">
-                    ##
-                    <div class="weui-cell">
-                        ##
-                        <div class="weui-cell__bd weui-cell_primary">总计支出</div>
-                        ##
-                        <div class="weui-cell__ft" th:text="${report.debit.total_debit}"></div>
-                        ##
-                    </div>
-                    ##
-                    <div class="weui-cell">
-                        ##
-                        <div class="weui-cell__bd weui-cell_primary">较昨天比较</div>
-                        ##
-                        <div class="weui-cell__ft">
-                            ## <span style="color: green" th:if="${report.debit.compare>0}" th:text="'↑'+${report.debit.compare_value}"></span>
-                            ## <span style="color: red" th:if="${report.debit.compare<0}" th:text="'↓'+${report.debit.compare_value}"></span>
-                            ## <span th:if="${report.debit.compare<0}" th:text="${report.debit.compare_value}"></span>
-                            ##
-                        </div>
-                        ##
-                    </div>
-                    ##
-                </div>
-                ##
-            </div>
 
         </div>
     </div>