master
yixian 7 years ago
parent 87a0ff4514
commit 45d3716a86

@ -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.

@ -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">

Loading…
Cancel
Save