Merge remote-tracking branch 'origin/develop' into develop

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 + "]");
         }
     }

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 + "]");
         }
     }

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);
 }

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();

src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java

@@ -48,7 +48,11 @@ public class AliforexcelServiceImpl implements AliforexcelService {
                 row = sheet.createRow(++rowNum);
                 row.createCell(0, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("company_name"));
                 row.createCell(1, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("short_name"));
-                row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("client_moniker"));
+                if (!"".equals(partner.getString("ali_sub_merchant_id"))) {
+                    row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("ali_sub_merchant_id"));
+                }else {
+                    row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("client_moniker"));
+                }
                 row.createCell(3, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("alipayindustry"));
                 row.createCell(4, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("address")+","+partner.getString("suburb") + "," + partner.getString("state") + "," + partner.getString("postcode"));
                 row.createCell(5, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("business_hours"));

src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml

@@ -168,7 +168,7 @@
     </select>
     <select id="passPartners" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        company_name,short_name,client_moniker,alipayindustry,address,suburb,state,postcode,business_hours,company_phone,merchant_introduction
+        company_name,short_name,client_moniker,ali_sub_merchant_id,alipayindustry,address,suburb,state,postcode,business_hours,company_phone,merchant_introduction
         from sys_clients
         <where>
             (approve_result=1 or (approve_result=2 and (source=1 or source=2)))