abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复 日常收费 bug

Browse Source
This commit is contained in:
ryoeiken 2020-12-25 14:34:09 +08:00
parent bb0adb833a
commit 0704a2a51c
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtReportMealsDaoController.java
View File

@ -46,6 +46,7 @@ public class FtReportMealsDaoController extends BaseController {
QueryWrapper<FtReportMealsDao> wrapper = new QueryWrapper<>(); QueryWrapper<FtReportMealsDao> wrapper = new QueryWrapper<>();
wrapper.eq("patient_id", patientId); wrapper.eq("patient_id", patientId);
wrapper.eq("settlement_flag", 1);
wrapper.orderByDesc("settlement_at"); wrapper.orderByDesc("settlement_at");
wrapper.last("limit 1"); wrapper.last("limit 1");
FtReportMealsDao ftReportMealsDao = iFtReportMealsDaoService.getOne(wrapper); FtReportMealsDao ftReportMealsDao = iFtReportMealsDaoService.getOne(wrapper);

8
ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java
View File

@ -114,10 +114,10 @@ public class FtSettleDaoController extends BaseController {
FtPrepaymentDao prepaymentDao = iFtPrepaymentDaoService.getOne(prepaymentWrapper); FtPrepaymentDao prepaymentDao = iFtPrepaymentDaoService.getOne(prepaymentWrapper);
// 预付费扣费 // 预付费扣费
BigDecimal prepaid = prepaymentDao.getPrepaid(); // BigDecimal prepaid = prepaymentDao.getPrepaid();
BigDecimal balance = prepaid.subtract(netPeceipt); // BigDecimal balance = prepaid.subtract(netPeceipt);
prepaymentDao.setPrepaid(balance); // prepaymentDao.setPrepaid(balance);
iFtPrepaymentDaoService.updateById(prepaymentDao); // iFtPrepaymentDaoService.updateById(prepaymentDao);
// 添加结算记录 // 添加结算记录
FtSettleDao ftSettleDao = new FtSettleDao(); FtSettleDao ftSettleDao = new FtSettleDao();

2
ruoyi-ui/src/views/fantang/settle/index.vue
View File

@ -204,7 +204,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="结算总价" prop="price"> <el-form-item label="结算总价" prop="price">
<el-input v-model="formAddNewSettlement.price" :disabled="true"/> <el-input v-model="this.sumTotalPrice" :disabled="true"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>