From fed8e1f8e9610c5672eeb25ce3c504e0be5cbad6 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Thu, 20 Sep 2018 20:32:18 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[fix]=E6=B7=BB=E5=8A=A0Rpay+=E4=BA=A4?=
 =?UTF-8?q?=E6=98=93=E9=A2=9D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/analysis/templates/trans_analysis.html | 8 ++++----
 .../static/analysis/templates/trans_analysis_monthly.html | 8 ++++----
 src/main/ui/static/dashboard/templates/dashboard.html     | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html
index 4918d98d9..9fac48e1a 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -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"/>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
index 7896d249a..624069fa8 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
@@ -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>-->
diff --git a/src/main/ui/static/dashboard/templates/dashboard.html b/src/main/ui/static/dashboard/templates/dashboard.html
index 55c56f2fa..d59afe063 100644
--- a/src/main/ui/static/dashboard/templates/dashboard.html
+++ b/src/main/ui/static/dashboard/templates/dashboard.html
@@ -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>

From e6564c9ada9c2b739841e6ad1c30cbc9d7fd3e17 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 21 Sep 2018 13:30:53 +0800
Subject: [PATCH 2/3] fix rpay+ icon

---
 src/main/ui/static/templates/payment/v1/payment.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/templates/payment/v1/payment.css b/src/main/ui/static/templates/payment/v1/payment.css
index 5c535ec04..73c482eed 100644
--- a/src/main/ui/static/templates/payment/v1/payment.css
+++ b/src/main/ui/static/templates/payment/v1/payment.css
@@ -366,7 +366,7 @@ input.value:focus {
     background-color: #108ee9;
 }
 
-.button_sp_area.alipay .paynow {
+.button_sp_area.rpay .paynow {
     background-color: #FF2D55;
 }
 

From 351efaaec252f4198b55c26430ff44b55f69bfb3 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Fri, 21 Sep 2018 18:46:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=80=E6=94=BE=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E5=8F=82=E4=B8=8E=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impls/CustomerLotteryCountServiceImpl.java | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerLotteryCountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerLotteryCountServiceImpl.java
index 4a20c7247..fb2296368 100644
--- a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerLotteryCountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerLotteryCountServiceImpl.java
@@ -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,9 +42,20 @@ 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) {
-            return;
+            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");