From 8657a73b920f57da1bb5fb7e287f37ee75f7b9c1 Mon Sep 17 00:00:00 2001
From: czx <28353131@qq.com>
Date: Mon, 30 Nov 2020 15:06:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0=E9=A2=84?=
 =?UTF-8?q?=E6=94=B6=E8=B4=B9=E8=AE=B0=E5=BD=95=E9=BB=98=E8=AE=A4=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E5=AE=8C=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/fantang/controller/FtPrepaymentDaoController.java   | 3 +++
 .../java/com/ruoyi/system/fantang/domain/FtPrepaymentVo.java   | 2 +-
 ruoyi-ui/src/views/fantang/prepayment/index.vue                | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java
index 8a082fb7a..b81713990 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java
@@ -16,6 +16,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -114,6 +115,8 @@ public class FtPrepaymentDaoController extends BaseController {
     @Log(title = "收费管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody FtPrepaymentVo ftPrepaymentDao) {
+        ftPrepaymentDao.setCollectAt(new Date());
+        ftPrepaymentDao.setSettlementFlag(0);
         return toAjax(iFtPrepaymentDaoService.save(ftPrepaymentDao) ? 1 : 0);
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentVo.java
index 69cb87c82..fcda98bd0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentVo.java
@@ -75,7 +75,7 @@ public class FtPrepaymentVo implements Serializable {
      * 结算标志
      */
     @Excel(name = "结算标志")
-    private Long settlementFlag;
+    private Integer settlementFlag;
 
     /**
      * 预付费金额
diff --git a/ruoyi-ui/src/views/fantang/prepayment/index.vue b/ruoyi-ui/src/views/fantang/prepayment/index.vue
index b1dda03e4..83e07f952 100644
--- a/ruoyi-ui/src/views/fantang/prepayment/index.vue
+++ b/ruoyi-ui/src/views/fantang/prepayment/index.vue
@@ -202,6 +202,7 @@
     components: {},
     data() {
       return {
+        userName: null,
         settlementFlagOptions: [{
           value: null,
           label: '未交费'
@@ -260,6 +261,7 @@
     },
     created() {
       this.getDefaultNoPrepayment();
+      this.getUser();
     },
     mounted() {
     },