记得上下班打卡 | git大法好,push需谨慎

Commit 041d4829 authored by jiangxiulong's avatar jiangxiulong

Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant

parents d8f8481b 86e7249a
...@@ -480,11 +480,10 @@ public class KylinRefundsStatusServiceImpl { ...@@ -480,11 +480,10 @@ public class KylinRefundsStatusServiceImpl {
continue; continue;
} else { } else {
// 同步大麦退款 // 同步大麦 票务平台
KylinOrderTicketVo orderData = dataUtils.getOrderTicketVo(refund.getOrderTicketsId()); KylinOrderTicketVo orderData = dataUtils.getOrderTicketVo(refund.getOrderTicketsId());
KylinPerformanceVo vo = dataUtils.getPerformanceVo(orderData.getPerformanceId()); KylinPerformanceVo vo = dataUtils.getPerformanceVo(orderData.getPerformanceId());
taobaoTicketUtils.refundDamaiOrder(orderData, vo); taobaoTicketUtils.refundDamaiOrder(orderData, vo);
// TODO: 2021/12/21 jxl 同步票务平台
} }
} catch (Exception e) { } catch (Exception e) {
log.info("退款请求pay失败e" + e.getMessage()); log.info("退款请求pay失败e" + e.getMessage());
......
...@@ -72,11 +72,10 @@ public class OrderRefundOvertimeServiceImpl implements IKylinOrderRefundsService ...@@ -72,11 +72,10 @@ public class OrderRefundOvertimeServiceImpl implements IKylinOrderRefundsService
); );
if (res) { if (res) {
// 优惠券 库存 积分 大美已自己处理 // 优惠券 库存 积分 大美已自己处理
// 同步大麦退款 // 同步大麦 票务平台
KylinOrderTicketVo orderData = dataUtils.getOrderTicketVo(orderTicketsId); /*KylinOrderTicketVo orderData = dataUtils.getOrderTicketVo(orderTicketsId);
KylinPerformanceVo vo = dataUtils.getPerformanceVo(orderData.getPerformanceId()); KylinPerformanceVo vo = dataUtils.getPerformanceVo(orderData.getPerformanceId());
taobaoTicketUtils.refundDamaiOrder(orderData, vo); taobaoTicketUtils.refundDamaiOrder(orderData, vo);*/
// TODO: 2021/12/21 jxl 同步票务平台
return true; return true;
} else { } else {
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment