From f682caf7cb957c0c207a6d5c927dc48c9000d12b Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Thu, 9 Aug 2018 15:21:48 +0800
Subject: [PATCH] update

---
 .../listeners/ctrip/CtripAfterPaymentFinishListener.java       | 2 +-
 .../listeners/ctrip/CtripRefundFinishedEventListener.java      | 2 +-
 .../payment/manage/customers/core/CouponValidateService.java   | 2 +-
 .../manage/customers/core/impls/CouponValidateServiceImpl.java | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/apps/events/listeners/ctrip/CtripAfterPaymentFinishListener.java b/src/main/java/au/com/royalpay/payment/manage/apps/events/listeners/ctrip/CtripAfterPaymentFinishListener.java
index c15cb933a..7d60245c5 100644
--- a/src/main/java/au/com/royalpay/payment/manage/apps/events/listeners/ctrip/CtripAfterPaymentFinishListener.java
+++ b/src/main/java/au/com/royalpay/payment/manage/apps/events/listeners/ctrip/CtripAfterPaymentFinishListener.java
@@ -34,7 +34,7 @@ public class CtripAfterPaymentFinishListener implements ApplicationListener<Afte
         if (accuessCouponLogs != null&&accuessCouponLogs.size()>0) {
             JSONObject accuessCouponLog = accuessCouponLogs.get(0);
             String couponId = accuessCouponLog.getString("coupon_id");
-            couponValidateService.ctripCouponLogNotice(couponId,orderId,order.getString("customer_id"));
+            couponValidateService.ctripCouponLogNotice(couponId,orderId,order.getString("customer_id"),order.getString("status"));
             logger.info("订单 [" + orderId + "]推送支付成功Ctrip卡券=======>[" + couponId + "]");
         }
     }
diff --git a/src/main/java/au/com/royalpay/payment/manage/apps/events/listeners/ctrip/CtripRefundFinishedEventListener.java b/src/main/java/au/com/royalpay/payment/manage/apps/events/listeners/ctrip/CtripRefundFinishedEventListener.java
index 7ca36e060..08bcffb3a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/apps/events/listeners/ctrip/CtripRefundFinishedEventListener.java
+++ b/src/main/java/au/com/royalpay/payment/manage/apps/events/listeners/ctrip/CtripRefundFinishedEventListener.java
@@ -38,7 +38,7 @@ public class CtripRefundFinishedEventListener implements ApplicationListener<Ref
         if (accuessCouponLogs != null&&accuessCouponLogs.size()>0) {
             JSONObject accuessCouponLog = accuessCouponLogs.get(0);
             String couponId = accuessCouponLog.getString("coupon_id");
-            couponValidateService.ctripCouponLogNotice(couponId,orderId,order.getString("customer_id"));
+            couponValidateService.ctripCouponLogNotice(couponId,orderId,order.getString("customer_id"),order.getString("status"));
             logger.info("订单 [" + orderId + "]推送退款成功Ctrip卡券=======>[" + couponId + "]");
         }
     }
diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/CouponValidateService.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/CouponValidateService.java
index bbeceeec6..aa4c83f1f 100644
--- a/src/main/java/au/com/royalpay/payment/manage/customers/core/CouponValidateService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/CouponValidateService.java
@@ -20,5 +20,5 @@ public interface CouponValidateService {
 
     JSONObject ctripCouponInfo(String coupon_log_id,int client_id);
 
-    JSONObject ctripCouponLogNotice(String coupon_log_id,String order_id,String open_id);
+    JSONObject ctripCouponLogNotice(String coupon_log_id,String order_id,String open_id,String status);
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java
index 8b929ed12..bca4104db 100644
--- a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java
@@ -196,12 +196,13 @@ public class CouponValidateServiceImpl implements CouponValidateService {
     }
 
     @Override
-    public JSONObject ctripCouponLogNotice(String coupon_id, String order_id, String open_id) {
+    public JSONObject ctripCouponLogNotice(String coupon_id, String order_id, String open_id,String status) {
         String uri = signUrl(UriComponentsBuilder.fromHttpUrl(CUSTOMER_HOST + "coupon/"+coupon_id+"/addCtripCouponLog"));
         HttpRequestGenerator gen = new HttpRequestGenerator(uri, RequestMethod.POST);
         List<NameValuePair> params = new ArrayList<>();
         params.add(new BasicNameValuePair("order_id", order_id));
         params.add(new BasicNameValuePair("openid", open_id));
+        params.add(new BasicNameValuePair("status", status));
         gen.setFormStringEntity(params);
         try {
             HttpRequestResult reqResult = gen.execute();