diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java index 58bc2b0d4..5cef32e7a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java @@ -17,6 +17,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; /** @@ -92,6 +93,8 @@ public class FtSettleDaoController extends BaseController { @Log(title = "结算报", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody FtSettleDao ftSettleDao) { + ftSettleDao.setSettleAt(new Date()); + ftSettleDao.setReceipts(ftSettleDao.getNetPeceipt()); return toAjax(iFtSettleDaoService.save(ftSettleDao) ? 1 : 0); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSettleDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSettleDao.java index c0e2ada4c..4125b440f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSettleDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSettleDao.java @@ -1,5 +1,6 @@ package com.ruoyi.system.fantang.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -94,4 +95,7 @@ public class FtSettleDao implements Serializable { */ @Excel(name = "退款总额") private BigDecimal refund; + + @TableField(exist = false) + private BigDecimal netPeceipt; } diff --git a/ruoyi-ui/src/views/fantang/settle/index.vue b/ruoyi-ui/src/views/fantang/settle/index.vue index 1f43afc83..8c76e77b3 100644 --- a/ruoyi-ui/src/views/fantang/settle/index.vue +++ b/ruoyi-ui/src/views/fantang/settle/index.vue @@ -161,7 +161,7 @@ - + @@ -229,29 +229,27 @@ - - - + - + - + - + - + - + - +