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

master
eason 6 years ago
commit 01d41922c2

@ -34,7 +34,7 @@ public class CtripAfterPaymentFinishListener implements ApplicationListener<Afte
if (accuessCouponLogs != null&&accuessCouponLogs.size()>0) { if (accuessCouponLogs != null&&accuessCouponLogs.size()>0) {
JSONObject accuessCouponLog = accuessCouponLogs.get(0); JSONObject accuessCouponLog = accuessCouponLogs.get(0);
String couponId = accuessCouponLog.getString("coupon_id"); 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 + "]"); logger.info("订单 [" + orderId + "]推送支付成功Ctrip卡券=======>[" + couponId + "]");
} }
} }

@ -38,7 +38,7 @@ public class CtripRefundFinishedEventListener implements ApplicationListener<Ref
if (accuessCouponLogs != null&&accuessCouponLogs.size()>0) { if (accuessCouponLogs != null&&accuessCouponLogs.size()>0) {
JSONObject accuessCouponLog = accuessCouponLogs.get(0); JSONObject accuessCouponLog = accuessCouponLogs.get(0);
String couponId = accuessCouponLog.getString("coupon_id"); 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 + "]"); logger.info("订单 [" + orderId + "]推送退款成功Ctrip卡券=======>[" + couponId + "]");
} }
} }

@ -20,5 +20,5 @@ public interface CouponValidateService {
JSONObject ctripCouponInfo(String coupon_log_id,int client_id); 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);
} }

@ -196,12 +196,13 @@ public class CouponValidateServiceImpl implements CouponValidateService {
} }
@Override @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")); String uri = signUrl(UriComponentsBuilder.fromHttpUrl(CUSTOMER_HOST + "coupon/"+coupon_id+"/addCtripCouponLog"));
HttpRequestGenerator gen = new HttpRequestGenerator(uri, RequestMethod.POST); HttpRequestGenerator gen = new HttpRequestGenerator(uri, RequestMethod.POST);
List<NameValuePair> params = new ArrayList<>(); List<NameValuePair> params = new ArrayList<>();
params.add(new BasicNameValuePair("order_id", order_id)); params.add(new BasicNameValuePair("order_id", order_id));
params.add(new BasicNameValuePair("openid", open_id)); params.add(new BasicNameValuePair("openid", open_id));
params.add(new BasicNameValuePair("status", status));
gen.setFormStringEntity(params); gen.setFormStringEntity(params);
try { try {
HttpRequestResult reqResult = gen.execute(); HttpRequestResult reqResult = gen.execute();

@ -48,7 +48,11 @@ public class AliforexcelServiceImpl implements AliforexcelService {
row = sheet.createRow(++rowNum); row = sheet.createRow(++rowNum);
row.createCell(0, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("company_name")); 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(1, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("short_name"));
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(2, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("client_moniker"));
}
row.createCell(3, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("alipayindustry")); 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(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")); row.createCell(5, Cell.CELL_TYPE_STRING).setCellValue(partner.getString("business_hours"));

@ -168,7 +168,7 @@
</select> </select>
<select id="passPartners" resultType="com.alibaba.fastjson.JSONObject"> <select id="passPartners" resultType="com.alibaba.fastjson.JSONObject">
SELECT 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 from sys_clients
<where> <where>
(approve_result=1 or (approve_result=2 and (source=1 or source=2))) (approve_result=1 or (approve_result=2 and (source=1 or source=2)))

Loading…
Cancel
Save