Merge branch 'develop'

master
yixian 4 years ago
commit 3fc7f6bec4

@ -66,6 +66,7 @@ import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.thymeleaf.context.Context;
import org.thymeleaf.spring5.SpringTemplateEngine;
@ -940,16 +941,17 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
ctx.setVariable("title", "RoyalPay风控调查 — " + client.getString("short_name"));
break;
case RISK_ORDER_TYPE_CHARGEBACK:
for (String orderId : realOrderIds) {
JSONObject order = orderMapper.findOrderById(orderId, client.getIntValue("client_id"));
if (order == null) {
throw new BadRequestException("Order: " + orderId + " not exists");
}
order.put(ExtParamsUtils.EXT_PARAMS, ExtParamsUtils.getExtParams(order));
orders.add(order);
Assert.isTrue(realOrderIds.length == 1, "Invalid risk event");
String orderId = realOrderIds[0];
JSONObject order = orderMapper.findOrderById(orderId, client.getIntValue("client_id"));
if (order == null) {
throw new BadRequestException("Order: " + orderId + " not exists");
}
order.put("pay_time", DateFormatUtils.format(order.getDate("pay_time"), "yyyy-MM-dd HH:mm:ss"));
order.put(ExtParamsUtils.EXT_PARAMS, ExtParamsUtils.getExtParams(order));
ctx.setVariable("orderInfo", order);
ctx.setVariable("title", "Chargeback Notification from UPay");
ctx.setVariable("orders", orders);
break;
}
return ctx;

@ -146,58 +146,58 @@
RoyalPay's risk management system has identified abnormal transactions from your records in a short time(<span th:if="${warning_order_type==0}" style="background: #FCE824">Single person pays large sums several times</span><span th:if="${warning_order_type==1}" style="background: #FCE824">frequent refund transactions</span>),which triggered the platform risk control warning. Here reminds: Do not use the platform for illegal transactions. Once verified, the payment authority will be closed. </p>
</div>
<div th:if="${order_type==6}">
<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>
<b>
Dear UPay merchant :<br>
尊敬的UPay商户 :<br>
</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>
由于消费者申请Chargeback请于
<span th:text="${reply_date}" style="background: #FCE824;"></span>
<span style="background: #FCE824;">下午5:00悉尼时间</span>
尽可能提供以下证明材料:
You have received a Chargeback for the following transaction from the Cardholder's bank.
The transaction funds have been temporarily frozen.You have been charged the Chargeback Fee 40AUD as indicated
in your Pricing Schedule and the original transaction amount has been debited from your account balance.
Please provide the materials in English by <span style="color: #FC2424;" th:text="${reply_date_english}"></span>
by 6:00 pm (Sydney time).
<br>
您已收到来自持卡人银行的Chargeback。因此该交易款已被暂时冻结并从您的账户余额中扣除Chargeback Fee 40AUD。请在
<span th:text="${reply_date}" style="color: #FC2424;"></span>
<span style="color: #FC2424;">下午6:00悉尼时间</span>
提供以下英文版材料:
</p>
<p>
If you have already reversed this transaction, please provide details of the refund so that we can return the
debit to the Cardholder's bank.
If you have not refunded this transaction, or if an error has occurred, do not process a refund to the
Cardholder's account.<br>
如果您已处理退款,请提供退款详情,以便我们将借记的款项退回持卡人的银行。如果您未退款,或者发生了错误,请不要向持卡人的帐户进行退款。
</p>
<dl>
<dt>The relevant transaction details: (交易详情):</dt>
<dd>Order ID: <span th:text="${orderInfo.order_id}"></span></dd>
<dd>Date & Time: <span th:text="${orderInfo.pay_time}"></span></dd>
<dd>Card Number: <span th:text="${orderInfo.ext_params.card_alias}"></span></dd>
<dd>Customer Name: <span th:text="${orderInfo.ext_params.name}"></span></dd>
<dd>Customer Address: <span th:text="${orderInfo.ext_params.address}"></span></dd>
<dd>Amount: <span th:text="|AUD ${orderInfo.clearing_amount}|"></span></dd>
<dd>Reason: <span th:text="${description}"></span></dd>
</dl>
<p>
Due to customer applied chargeback issue. Please provide as much materials as best for the transaction
before <span style="background: #FCE824;" th:text="${reply_date_english}"></span>(Sydney time).
Please send (Where applicable):
</p>
<p>1、持卡人签名授权书和/或收据的清晰副本</p>
<p>1. A legible copy of the signed authority and/or receipts from the Cardholder.</p>
<p>2、任何税务发票和/或签署的披露取消政策的副本</p>
<p>1、持卡人签名授权书和/或收据的清晰副本</p>
<p>2. Copy of any tax invoice/s and/or signed disclosure of cancellation policy.</p>
<p>3、与在线购买的任何数字商品的销售有关的任何交易信息</p>
<p>2、任何税务发票和/或签署的披露取消政策的副本</p>
<p>3. Any transaction Information relating to the sale of any digital goods purchased online.</p>
<p>4、提供的商品/服务的说明和/或交付/收货的证明。(消费者买了什么,商家卖了什么,消费者收没收到货,如何收到的)</p>
<p>3、与在线购买的任何数字商品的销售有关的任何交易信息</p>
<p>4. Description of the goods/services supplied and/or proof of delivery/collection of goods.</p>
<p>5、邮件订单/电话订单交易收据的副本</p>
<p>4、提供的商品/服务的说明和/或交付/收货的证明。(消费者买了什么,商家卖了什么,消费者收没收到货,如何收到的)</p>
<p>5. Copy of Mail Order/telephone order transaction receipt.</p>
<p>6、持卡人身份或与持卡人的任何形式的通信包括电子邮件通信。</p>
<p>5、邮件订单/电话订单交易收据的副本</p>
<p>6. Cardholder identification or any form of communication with the Cardholder, including email
correspondence.</p>
<p>6、持卡人身份或与持卡人的任何形式的通信包括电子邮件通信。</p>
<table style="border: 1.0px solid;border-collapse: collapse;">
<thead>
<tr>
<th style="border: 1.0px solid;border-collapse: collapse;">Order ID</th>
<th style="border: 1.0px solid;border-collapse: collapse;">Amount</th>
<th style="border: 1.0px solid;border-collapse: collapse;">Status</th>
<th style="border: 1.0px solid;border-collapse: collapse;">Create Time</th>
<th style="border: 1.0px solid;border-collapse: collapse;">Card Number</th>
</tr>
</thead>
<tbody>
<tr th:each="order : ${orders}">
<td th:text="${order.order_id}" style="border: 1.0px solid;border-collapse: collapse;"></td>
<td th:text="AUD+${order.clearing_amount}" style="border: 1.0px solid;border-collapse: collapse;"></td>
<td th:text="${order.status}" style="border: 1.0px solid;border-collapse: collapse;"></td>
<td th:text="${order.create_time}" style="border: 1.0px solid;border-collapse: collapse;"></td>
<td th:text="${order.ext_params.card_alias}" style="border: 1.0px solid;border-collapse: collapse;"></td>
</tr>
</tbody>
</table>
<p th:if="${description != null}"><span th:text="${description}"></span></p>
<p><strong>Chargeback将会扣除$40作为Chargeback Fee同时扣除对应订单交易额申诉成功后将返还订单交易额还请及时提交材料。</strong><!--还请按时提供商户材料并直接回复该邮件, -->
感谢,辛苦。</p>
<!--<p>请点击此链接上传所需材料<a th:href="${uploadUrl}"><span th:text="${uploadUrl}"></span></a></p>-->

@ -423,7 +423,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
$scope.configHoliday = function (date) {
let holiday = $scope.activeDates[$filter('date')(date, 'yyyy/MM/dd')];
if (holiday == null) {
holiday = {'holiday': date, regions: []}
holiday = {'holiday': $filter('date')(date, 'yyyy/MM/dd'), regions: []}
}
$uibModal.open({
templateUrl: '/static/analysis/templates/dialog_holiday_config.html',

Loading…
Cancel
Save