浏览代码

零星收费增加,账户充值类型,费用充到账户余额

周箭河 5 年之前
父节点
当前提交
2f6608a3e4

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

@@ -305,6 +305,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         studentPaymentOrder.setVersion(0);
         Date date = new Date();
         if (sporadicPayDto.getUseBalancePayment() && amount.compareTo(BigDecimal.ZERO) > 0) {
+            if(chargeInfo.getChargeType().getCode().equals(9)){
+                throw new BizException("账户充值不支持余额支付");
+            }
             SysUserCashAccount userCashAccount = sysUserCashAccountService.get(userId);
 
             if (userCashAccount == null) {

+ 1 - 1
mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -514,7 +514,7 @@ public class ExportController extends BaseController {
                     }else if (row.getChargeType().equals(7)) {
                         row.setSporadicType("上门费");
                     }else if (row.getChargeType().equals(9)) {
-                        row.setSporadicType("账户余额充值");
+                        row.setSporadicType("账户充值");
                     }
                 }
                 School userSchool = musicGroupDao.findUserSchool(row.getUserId());