Jelajahi Sumber

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

周箭河 5 tahun lalu
induk
melakukan
08d978ac36

+ 7 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/SporadicChargeInfoImpl.java

@@ -74,11 +74,16 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
         Map<Integer, String> yimei = new HashMap();
         map.put(userId, userId.toString());
         if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
-            //活动,增加课程余额
-            if (info.getChargeType().getCode() == 6 || info.getChargeType().getCode() == 8) {
+            //福袋活动,增加课程余额
+            if (info.getChargeType().getCode() == 6) {
                 sysUserCashAccountService.appendCourseBalance(userId, studentPaymentOrder.getActualAmount(), "活动");
             }
 
+            //零星收费账户充值
+            if (info.getChargeType().getCode() == 8) {
+                sysUserCashAccountService.updateBalance(userId, studentPaymentOrder.getActualAmount(),PlatformCashAccountDetailTypeEnum.RECHARGE, "零星收费账户充值");
+            }
+
             //插入交易明细
             BigDecimal amount = studentPaymentOrder.getActualAmount();
             Date nowDate = new Date();

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

@@ -513,6 +513,8 @@ public class ExportController extends BaseController {
                         row.setSporadicType("福袋活动");
                     }else if (row.getChargeType().equals(7)) {
                         row.setSporadicType("上门费");
+                    }else if (row.getChargeType().equals(8)) {
+                        row.setSporadicType("账户充值");
                     }
                 }
                 School userSchool = musicGroupDao.findUserSchool(row.getUserId());