Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/SporadicChargeTypeEnum.java

@@ -10,7 +10,8 @@ public enum SporadicChargeTypeEnum implements BaseEnum<Integer, SporadicChargeTy
     SERVICE_FEE(5,"维修费"),
     LUCKY_BAG_ACTIVE(6,"福袋活动"),
     VISITING_FEE(7,"上门费"),
-    VIP_BUY(8,"VIP课购买");
+    VIP_BUY(8,"VIP课购买"),
+    RECHARGE(9,"VIP课购买");
 
     private Integer code;
 

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() == 9) {
+                sysUserCashAccountService.updateBalance(userId, studentPaymentOrder.getActualAmount(),PlatformCashAccountDetailTypeEnum.RECHARGE, "零星收费账户充值");
+            }
+
             //插入交易明细
             BigDecimal amount = studentPaymentOrder.getActualAmount();
             Date nowDate = new Date();

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(9)) {
+                        row.setSporadicType("账户余额充值");
                     }
                 }
                 School userSchool = musicGroupDao.findUserSchool(row.getUserId());