|
@@ -359,7 +359,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
|
|
|
Map<String, BigDecimal> routingFee = (Map<String, BigDecimal>) payMap.get("routingFee");
|
|
|
studentPaymentOrder.setOrganId(chargeInfo.getOrganId());
|
|
|
- studentPaymentOrder.setRoutingOrganId(chargeInfo.getOrganId());
|
|
|
+ //studentPaymentOrder.setRoutingOrganId(chargeInfo.getOrganId());
|
|
|
+ studentPaymentOrder.setRoutingOrganId((Integer) payMap.get("routingOrganId"));
|
|
|
studentPaymentOrder.setComAmount(routingFee.get("COM"));
|
|
|
studentPaymentOrder.setPerAmount(routingFee.get("PER"));
|
|
|
studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));
|
|
@@ -593,7 +594,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
|
|
|
Map<String, BigDecimal> routingFee = (Map<String, BigDecimal>) payMap.get("routingFee");
|
|
|
studentPaymentOrder.setOrganId(musicGroup.getOrganId());
|
|
|
- studentPaymentOrder.setRoutingOrganId(42);
|
|
|
+ studentPaymentOrder.setRoutingOrganId((Integer) payMap.get("routingOrganId"));
|
|
|
studentPaymentOrder.setComAmount(routingFee.get("COM"));
|
|
|
studentPaymentOrder.setPerAmount(routingFee.get("PER"));
|
|
|
studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));
|
|
@@ -831,7 +832,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
|
|
|
Map<String, BigDecimal> routingFee = (Map<String, BigDecimal>) payMap.get("routingFee");
|
|
|
studentPaymentOrder.setOrganId(musicGroup.getOrganId());
|
|
|
- studentPaymentOrder.setRoutingOrganId(42);
|
|
|
+ studentPaymentOrder.setRoutingOrganId((Integer) payMap.get("routingOrganId"));
|
|
|
studentPaymentOrder.setComAmount(routingFee.get("COM"));
|
|
|
studentPaymentOrder.setPerAmount(routingFee.get("PER"));
|
|
|
studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));
|
|
@@ -1672,7 +1673,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
|
|
|
Map<String, BigDecimal> routingFee = (Map<String, BigDecimal>) payMap.get("routingFee");
|
|
|
studentPaymentOrder.setOrganId(musicGroup.getOrganId());
|
|
|
- studentPaymentOrder.setRoutingOrganId(42);
|
|
|
+ studentPaymentOrder.setRoutingOrganId((Integer) payMap.get("routingOrganId"));
|
|
|
studentPaymentOrder.setComAmount(routingFee.get("COM"));
|
|
|
studentPaymentOrder.setPerAmount(routingFee.get("PER"));
|
|
|
studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));
|