Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -1557,7 +1557,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             throw new BizException("已缴费");
         }
 
-        BigDecimal amount = musicGroupStudentFee.getCourseFee();
+        BigDecimal amount = musicGroupStudentFee.getTemporaryCourseFee();
         if (amount == null || amount.doubleValue() == 0) {
             amount = userLastCalenderDetail.getExpectAmount();
         }
@@ -1596,7 +1596,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             studentPaymentOrder.setPaymentChannel("BALANCE");
             if (userCashAccount.getBalance().subtract(amount).doubleValue() >= 0) {
                 // 更新订单信息
+                studentPaymentOrder.setActualAmount(BigDecimal.ZERO);
                 studentPaymentOrder.setBalancePaymentAmount(amount);
+                studentPaymentOrder.setActualAmount(new BigDecimal(0));
                 studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
                 studentPaymentOrder.setUpdateTime(date);
                 studentPaymentOrder.setOrganId(musicGroup.getOrganId());
@@ -1635,6 +1637,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                     sysUserCashAccountService.updateBalance(userId, userCashAccount.getBalance().negate(), PlatformCashAccountDetailTypeEnum.PAY_FEE, "乐团续费");
                     amount = amount.subtract(userCashAccount.getBalance());
                     studentPaymentOrder.setBalancePaymentAmount(userCashAccount.getBalance());
+                    studentPaymentOrder.setActualAmount(studentPaymentOrder.getActualAmount().subtract(userCashAccount.getBalance()));
                 } else {
                     studentPaymentOrder.setBalancePaymentAmount(new BigDecimal(0));
                 }
@@ -1662,6 +1665,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             );
 
             Map<String, BigDecimal> routingFee = (Map<String, BigDecimal>) payMap.get("routingFee");
+            studentPaymentOrder.setActualAmount(amount);
             studentPaymentOrder.setOrganId(musicGroup.getOrganId());
             studentPaymentOrder.setRoutingOrganId((Integer) payMap.get("routingOrganId"));
             studentPaymentOrder.setComAmount(routingFee.get("COM"));