Merge remote-tracking branch 'origin/develop'

src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java

@@ -490,12 +490,14 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
 
     }
 
+    @Transactional
     @Override
     public void sendRefuseEmail(String riskId, String refuseDescription) throws IOException {
         JSONObject event = getRiskEventDetail(riskId);
         if (RiskResultTypeEnum.MATERIAL_NOT_PASS.getResultType().intValue() == event.getIntValue("result_type")) {
             throw new BadRequestException("Refused Already!");
         }
+        riskMaterialService.updateRiskMaterial(riskId, refuseDescription);
         Context ctx = getMailContext(event);
         ctx.setVariable("refuse",true);
         ctx.setVariable("refuse_description", riskMaterialMapper.findAllMaterials(riskId).get(0).getString("refuse_description"));
@@ -511,7 +513,6 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
                 event.put("result_type",RiskResultTypeEnum.MATERIAL_NOT_PASS.getResultType());
                 event.put("submit_url",uploadUrl);
                 riskEventMapper.update(event);
-                riskMaterialService.updateRiskMaterial(riskId, refuseDescription);
                 // 日志记录
                 riskProcessLogService.addRiskProcessLog(riskId,
                         event.getString("fillin_id"),

src/main/resources/templates/mail/risk_upload_mail.html

@@ -3,7 +3,7 @@
     <b>Dear <span th:text="${bdNamesStr}" th:if="${is_send_client==0}"></span><span th:text="${client.contact_person}" th:if="${is_send_client==1}"></span>:</b>
     <p>
         <span th:text="${hello}"></span>，<span th:text="${bdNamesStr}" th:if="${is_send_client==0}"></span><span th:text="${client.contact_person}" th:if="${is_send_client==1}"></span>
-        <span th:if="${refuse}">,您提交的风控材料已被拒绝</span>。
+        <span th:if="${refuse}">，您提交的风控材料已被拒绝</span>。
         <span th:if="${refuse_description != null}">
             拒绝理由：<span th:text="${refuse_description}" style="background-color: yellow"></span>。
         </span>
@@ -12,7 +12,18 @@
         <span style="background: #FCE824;">下午5:00（悉尼时间）前</span>提供腾讯被查商户
         <span th:text="${client.short_name}"></span> (<span th:text="${client.client_moniker}"></span>)的以下材料：
     </p>
+
+    <p>
+        <span th:if="${refuse}">Your submission of risk materials has been rejected. </span>
+        <span th:if="${refuse_description != null}">
+            Reasons for rejection：<span th:text="${refuse_description}" style="background-color: yellow"></span>.
+        </span>
+        Please submit the following risk materials of merchant PINE
+        <span style="background: #FCE824;">before 29/11/2018(Sydney time). </span>
+    </p>
+
     <p>1、请提供以下被查单号的小票， 物流单据（如有邮寄产品的情况）， 以及消费者与买家的聊天记录等来佐证被查交易单号。 被查交易单号如下:</p>
+    <p>1. Please submit the materials including invoices, courier receipts (if have posted products), and chatting records or scene of consumption which can prove the facticity of the following reviewed orders. The reviewed orders as follows:</p>
     <table style="border: 1.0px solid;border-collapse: collapse;">
         <thead>
         <tr>
@@ -42,8 +53,14 @@
     <p th:if="${description != null}">2、<span th:text="${description}"></span></p>
     <p>如果提交的材料不齐， 则有关停支付的风险。<!--还请按时提供商户材料并直接回复该邮件， -->感谢，辛苦。</p>
     <!--<p>请点击此链接上传所需材料<a th:href="${uploadUrl}"><span th:text="${uploadUrl}"></span></a></p>-->
-    <p th:if="${is_send_client==0}"><a th:href="${uploadUrl}" style="color: rgb(255, 255, 255); text-align: center; padding: 12px 10px; height: 100%; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; text-decoration: none; background-color: #00c0ef; min-width: 150px;"><strong>Submit Risk Materials</strong></a></p>
     <p th:if="${is_send_client==1}">材料请通过APP在规定时间内进行上传，或请联系BD，由BD在后台进行上传。</p>
+    <p>
+        If you can not provide qualified materials on time, the payment channels would be suspended or restricted with amount limit. Please be sure to assist the investigation. Thanks.
+    </p>
+    <p th:if="${is_send_client==1}">
+        The materials can be uploaded by RoyalPay APP within the required time, or contact with BD.
+    </p>
+    <p th:if="${is_send_client==0}"><a th:href="${uploadUrl}" style="color: rgb(255, 255, 255); text-align: center; padding: 12px 10px; height: 100%; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; text-decoration: none; background-color: #00c0ef; min-width: 150px;"><strong>Submit Risk Materials</strong></a></p>
 </div>
 <div th:if="${order_type==3}">
     <b>尊敬的RoyalPay商户 :<br>