|
|
@@ -600,6 +600,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
studentPaymentOrder.setUpdateTime(date);
|
|
|
studentPaymentOrder.setVersion(0);
|
|
|
studentPaymentOrder.setCalenderId(calenderId);
|
|
|
+ studentPaymentOrder.setOrganId(organId);
|
|
|
+ studentPaymentOrder.setRoutingOrganId(organId);
|
|
|
studentPaymentOrderService.insert(studentPaymentOrder);
|
|
|
|
|
|
// 拆分各商品，如果有优惠券则计算使用券后的金额，并写入订单详情
|
|
|
@@ -635,8 +637,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
studentPaymentOrder.setBalancePaymentAmount(amount);
|
|
|
studentPaymentOrder.setActualAmount(new BigDecimal(0));
|
|
|
studentPaymentOrder.setUpdateTime(date);
|
|
|
- studentPaymentOrder.setOrganId(organId);
|
|
|
- studentPaymentOrder.setRoutingOrganId(organId);
|
|
|
studentPaymentOrderService.update(studentPaymentOrder);
|
|
|
sysUserCashAccountService.updateBalance(userId, amount.negate(), PlatformCashAccountDetailTypeEnum.PAY_FEE, "乐团续费");
|
|
|
amount = BigDecimal.ZERO;
|
|
|
@@ -852,6 +852,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
studentPaymentOrder.setPaymentChannel(channelType);
|
|
|
studentPaymentOrder.setMusicGroupId(studentRegistration.getMusicGroupId());
|
|
|
studentPaymentOrder.setCalenderId(calenderId);
|
|
|
+ studentPaymentOrder.setOrganId(musicGroup.getOrganId());
|
|
|
+ studentPaymentOrder.setRoutingOrganId(musicGroup.getOrganId());
|
|
|
studentPaymentOrderService.insert(studentPaymentOrder);
|
|
|
|
|
|
// 拆分各商品，如果有优惠券则计算使用券后的金额，并写入订单详情
|
|
|
@@ -891,8 +893,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
studentPaymentOrder.setPaymentChannel("BALANCE");
|
|
|
studentPaymentOrder.setRemitFee(goodsDto.getRemitFee());
|
|
|
studentPaymentOrder.setCourseRemitFee(goodsDto.getCourseRemitFee());
|
|
|
- studentPaymentOrder.setOrganId(musicGroup.getOrganId());
|
|
|
- studentPaymentOrder.setRoutingOrganId(musicGroup.getOrganId());
|
|
|
studentPaymentOrder.setUpdateTime(date);
|
|
|
|
|
|
if ("205".equals(studentPaymentOrder.getPaymentAccountNo())) {
|
zouxuan