Merge branch 'develop'

master
taylor.dang 6 years ago
commit bfe8d0b064

@ -17,6 +17,9 @@ import org.springframework.web.util.UriComponentsBuilder;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
@Service
public class CustomerLotteryCountServiceImpl implements ApplicationListener<AfterPaymentFinishEvent> {
@ -39,10 +42,21 @@ public class CustomerLotteryCountServiceImpl implements ApplicationListener<Afte
@Override
public void onApplicationEvent(AfterPaymentFinishEvent event) {
final JSONObject order = event.getFinishedEvent().getOrder();
//只允许pine商户参与该活动
//判断是否是pine测试商户若不是则判断是否在活动时间
if (order.getIntValue("client_id") != 9) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
Date newDay = new Date();
try {
if (newDay.compareTo(sdf.parse("2018-09-24 00:00:00")) < 0) {
return;
}
if (newDay.compareTo(sdf.parse("2018-10-15 00:00:00")) > 0) {
return;
}
} catch (ParseException e) {
}
}
BigDecimal clearAmount = event.getFinishedEvent().getAudFee();
String channel = order.getString("channel");
if ("Wechat".equals(channel)) {

@ -199,17 +199,17 @@
</div>
</div>
</div>
<!-- Rpay+显示交易额分析,先注释掉,日后可能需要显示
<!-- Rpay+显示交易额分析-->
<div class="col-sm-2 col-xs-6">
<div class="description-block">
<div class="description-header text-bold"><img src="/static/images/rpayplus.png"/>R Pay</div>
<div class="description-header text-bold"><img src="/static/images/rpayplus_sign.png"/>RPay+</div>
<div class="description-text text-red">
<label class="description-text"
ng-bind="totalChannelAmount.rpayamount|currency: ' $ '"></label>
</div>
</div>
</div>
-->
</div>
<!--<table class="table">
<tr>
@ -230,7 +230,7 @@
<img src="/static/images/jd_sign.png"/>
JD Pay:{{totalChannelAmount.jdPayAmount|currency: ' $ '}}</th>
<th>
<img src="/static/images/rpayplus.png"/>
<img src="/static/images/rpayplus_sign.png"/>
R Pay:{{totalChannelAmount.rpayamount|currency: ' $ '}}</th>
<th>
<img src="/static/images/hf_sign.png"/>

@ -160,17 +160,17 @@
</div>
</div>
<!-- 显示Rpay+交易额分析,先注释掉,日后可能需要显示
<!-- 显示Rpay+交易额分析-->
<div class="col-sm-2 col-xs-6">
<div class="description-block">
<div class="description-header text-bold"><img src="/static/images/rpayplus.png"/>R Pay</div>
<div class="description-header text-bold"><img src="/static/images/rpayplus_sign.png"/>RPay+</div>
<div class="description-text">
<label class="description-text text-red"
ng-bind="totalChannelAmount.rpayamount|currency: ' $ '"></label>
</div>
</div>
</div>
-->
</div>
<!-- <table class="table">
<tr>
@ -193,7 +193,7 @@
<img src="/static/images/hf_sign.png"/>
JD Pay:{{totalChannelAmount.hfPayAmount|currency: ' $ '}}</th>
<th>
<img src="/static/images/rpayplus.png"/>
<img src="/static/images/rpayplus_sign.png"/>
R Pay:{{totalChannelAmount.rpayamount|currency: ' $ '}}</th>
</tr>
</table>-->

@ -160,7 +160,7 @@
</div>
</div>
<!-- dashboard显示Rpay+交易额,先注释掉,日后可能需要显示
<!-- dashboard显示Rpay+交易额-->
<div class="col-sm-4 col-xs-6">
<div class="description-block">
<div class="description-text">交易额:
@ -171,10 +171,10 @@
<label class="description-text text-red"
ng-bind="totalChannelAmount.rpay_order_count"></label>
</div>
<div class="description-header text-bold"><img src="/static/images/rpayplus.png"/>R</div>
<div class="description-header text-bold"><img src="/static/images/rpayplus_sign.png"/>Rpay+</div>
</div>
</div>
-->
</div>
</div>

Loading…
Cancel
Save