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

src/db/modify.sql

@@ -64,7 +64,9 @@ ALTER TABLE `bd_access_log`
   MODIFY COLUMN `bd_id`  varchar(50) NOT NULL AFTER `date`;
 
 ALTER TABLE `sys_clients`
-  MODIFY COLUMN `creator`  varchar(50) NOT NULL COMMENT '创建者' AFTER `logo_thumbnail`;
+  MODIFY COLUMN `creator`  varchar(50) NOT NULL COMMENT '创建者' AFTER `logo_thumbnail`,
+  MODIFY COLUMN `approver`  varchar(50) NOT NULL AFTER `logo_thumbnail`;
+
 
 ALTER TABLE `pat_goods`
   MODIFY COLUMN `creator`  varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `is_using`;
@@ -89,3 +91,7 @@ ALTER TABLE `pat_goods`
 
 ALTER TABLE `pat_goods_sale`
   MODIFY COLUMN `good_id`  varchar(50) NOT NULL AFTER `client_id`;
+
+
+
+

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("status", status.getStatus());
-        params.put("channel", channel.toString());
+        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/mail/reset_password.html

@@ -42,8 +42,6 @@
                                     </td>
                                 </tr>
                                 </tbody></table>
-                        #end
-
                     </td>
                 </tr>
 

src/main/resources/templates/paynotice.html

@@ -9,36 +9,40 @@
     <link rel="stylesheet" href="/static/templates/payment/payment.css?t=201608312202">
     <script type="text/javascript" src="/static/templates/disable_wechat_menu.js?t=20170313"></script>
     <style type="text/css">
-        .weui_cell_ft{
+        .weui_cell_ft {
-            max-width:60%;
+            max-width: 60%;
             white-space: normal;
             word-break: break-all;
         }
-        .weui_cell:before{
+
+        .weui_cell:before {
             left: 0px;
-            border-top:1px solid #10B24C;
+            border-top: 1px solid #10B24C;
         }
-        .weui_cell{
+
+        .weui_cell {
             line-height: 30px;
         }
-        .client{
+
+        .client {
             color: white;
             font-size: 20px;
             font-family: Helvetica;
-            font-weight:bold;
+            font-weight: bold;
             text-align: center;
-            background-color:#10B24C;
+            background-color: #10B24C;
             line-height: 45px;
 
         }
-        .orderCells{
+
+        .orderCells {
             margin: 6%;
             border: 1px solid #979797;
             border-radius: 20px;
             overflow: hidden;
         }
 
-        .headimg{
+        .headimg {
             width: 30px;
             border-radius: 50%;
         }
@@ -63,10 +67,10 @@
         <div class="weui_cell_bd weui_cell_primary">
             <p>Price</p>
         </div>
-        <div class="weui_cell_ft">[[${order['currency']}]] [[${#numbers.formatDecimal(order['total_amount'],1,2)}]]</div>
+        <div class="weui_cell_ft">[[${order['currency']}]] [[${#numbers.formatDecimal(order['total_amount'],1,2)}]]
         </div>
-    <div th:if="${customer!=null}">
+    </div>
-        <div class="weui_cell">
+    <div class="weui_cell" th:if="${customer!=null}">
         <div class="weui_cell_bd weui_cell_primary">
             <p>Customer</p>
         </div>
@@ -74,19 +78,22 @@
             <img data-th-src="@{${customer['headimg']}}" class="headimg"> <span th:text="${customer.nickname}"></span>
         </div>
     </div>
-    </div>
     <div class="weui_cell">
         <div class="weui_cell_bd weui_cell_primary">
             <p>Customer Paid</p>
         </div>
-        <div class="weui_cell_ft">[[${order['currency']}]] [[${#numbers.formatDecimal(order['customer_payment_amount'],1,2)}]]</div>
+        <div class="weui_cell_ft">[[${order['currency']}]]
+            [[${#numbers.formatDecimal(order['customer_payment_amount'],1,2)}]]
+        </div>
     </div>
     <div th:if="${order.coupon_payment_amount>0}">
         <div class="weui_cell">
             <div class="weui_cell_bd weui_cell_primary">
                 <p>RoyalPay Subsidies</p>
             </div>
-            <div class="weui_cell_ft">[[${order['currency']}]] [[${#numbers.formatDecimal(order['coupon_payment_amount'],1,2)}]]</div>
+            <div class="weui_cell_ft">[[${order['currency']}]]
+                [[${#numbers.formatDecimal(order['coupon_payment_amount'],1,2)}]]
+            </div>
         </div>
     </div>
 
@@ -96,13 +103,11 @@
         </div>
         <div class="weui_cell_ft" th:text="${order.order_description}"></div>
     </div>
-    <div 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">
         <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>
     <div class="weui_cell">
         <div class="weui_cell_bd weui_cell_primary">

src/main/resources/templates/refund_status.html

@@ -49,7 +49,7 @@
 <div class="logo-box">
     <div class="row">
         <div th:if="${client.logo_url!=null} and ${client.logo_url!=''}">
-            <img src="${client.logo_url}" id="buslogo" class="logo">
+            <img data-th-src="@{${client['logo_url']}}" id="buslogo" class="logo">
         </div>
         <div th:if="${client.logo_url==null} or ${client.logo_url==''}">
             <img src="/static/images/logo640x640.jpg" id="buslogo" class="logo">

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>