Commit cf731730 by 胡敬轩

Merge remote-tracking branch 'remotes/origin/feature/Ka2.0.74-0413-0421-分账券'…

Merge remote-tracking branch 'remotes/origin/feature/Ka2.0.74-0413-0421-分账券' into feature/Ka2.0.76-0427-0504-多卡支付
parents 29df11f9 358d520d
...@@ -93,5 +93,5 @@ public class NewPaysuccessNoticeMessage { ...@@ -93,5 +93,5 @@ public class NewPaysuccessNoticeMessage {
/** /**
* 储值卡流水明细 * 储值卡流水明细
*/ */
private List<SvcPayItem> svcPayItems; private List<SvcPayItem> payItems;
} }
...@@ -630,7 +630,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -630,7 +630,7 @@ public class OrderServiceImpl implements Orderservice {
message.setRuleId(newMessage.getRuleId()); message.setRuleId(newMessage.getRuleId());
message.setSource(PaySuccessSource.OUTSIDE.getSource()); message.setSource(PaySuccessSource.OUTSIDE.getSource());
message.setThirdPartTradeNo(message.getThirdPartTradeNo()); message.setThirdPartTradeNo(message.getThirdPartTradeNo());
message.setSvcPayItems(newMessage.getSvcPayItems()); message.setSvcPayItems(newMessage.getPayItems());
String res = orderAdapterService.paySuccessCallback(message); String res = orderAdapterService.paySuccessCallback(message);
JSONObject jsonObject = JSONObject.parseObject(res); JSONObject jsonObject = JSONObject.parseObject(res);
if (jsonObject.containsKey("code")) { if (jsonObject.containsKey("code")) {
......
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