Browse Source

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

周箭河 5 years ago
parent
commit
c090f67c98

+ 2 - 1
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,"维修费"),
     SERVICE_FEE(5,"维修费"),
     LUCKY_BAG_ACTIVE(6,"福袋活动"),
     LUCKY_BAG_ACTIVE(6,"福袋活动"),
     VISITING_FEE(7,"上门费"),
     VISITING_FEE(7,"上门费"),
-    VIP_BUY(8,"VIP课购买");
+    VIP_BUY(8,"VIP课购买"),
+    RECHARGE(9,"VIP课购买");
 
 
     private Integer code;
     private Integer code;
 
 

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

@@ -80,7 +80,7 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
             }
             }
 
 
             //零星收费账户充值
             //零星收费账户充值
-            if (info.getChargeType().getCode() == 8) {
+            if (info.getChargeType().getCode() == 9) {
                 sysUserCashAccountService.updateBalance(userId, studentPaymentOrder.getActualAmount(),PlatformCashAccountDetailTypeEnum.RECHARGE, "零星收费账户充值");
                 sysUserCashAccountService.updateBalance(userId, studentPaymentOrder.getActualAmount(),PlatformCashAccountDetailTypeEnum.RECHARGE, "零星收费账户充值");
             }
             }
 
 

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

@@ -513,7 +513,7 @@ public class ExportController extends BaseController {
                         row.setSporadicType("福袋活动");
                         row.setSporadicType("福袋活动");
                     }else if (row.getChargeType().equals(7)) {
                     }else if (row.getChargeType().equals(7)) {
                         row.setSporadicType("上门费");
                         row.setSporadicType("上门费");
-                    }else if (row.getChargeType().equals(8)) {
+                    }else if (row.getChargeType().equals(9)) {
                         row.setSporadicType("账户余额充值");
                         row.setSporadicType("账户余额充值");
                     }
                     }
                 }
                 }