From 45d3716a86cab7857987f203c3c30317a103b0fe Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Mon, 25 Dec 2017 17:23:30 +0800
Subject: [PATCH] pay notice
---
.../manage/signin/core/impls/SignInAccountServiceImpl.java | 7 +------
src/main/resources/templates/paynotice.html | 4 ++--
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
index 00d68f90b..b118f7040 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
+++ b/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.
diff --git a/src/main/resources/templates/paynotice.html b/src/main/resources/templates/paynotice.html
index 4e15e52b9..a4aed4286 100644
--- a/src/main/resources/templates/paynotice.html
+++ b/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">