From 728a54cc02ff66e38bc8719ecc0f3155e597084c Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期五, 14 二月 2025 15:27:56 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang into xizang-changyun
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
index 98558e2..c90ea72 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
@@ -55,9 +55,8 @@
@ApiOperation(value = "缴费账单查询分页列表")
@PostMapping("list")
public R<PageInfo<TBillDto>> list(@RequestBody TBillQuery query){
- if (StringUtils.isEmpty(query.getUserId())){
- throw new ServiceException("用户ID不能为空");
- }
+ String userId = tokenService.getLoginUserApplet().getUserId();
+ query.setUserId(userId);
PageInfo<TBillDto> pageInfo = tBillService.queryPage(query);
return R.ok(pageInfo);
}
@@ -65,9 +64,8 @@
@ApiOperation(value = "缴费账单查询列表")
@PostMapping("/getBillIds")
public R<List<String>> getBillIds(@RequestBody TBillQuery query){
- if (StringUtils.isEmpty(query.getUserId())){
- throw new ServiceException("用户ID不能为空");
- }
+ String userId = tokenService.getLoginUserApplet().getUserId();
+ query.setUserId(userId);
List<String> billIds = tBillService.getBillIds(query);
return R.ok(billIds);
}
@@ -90,9 +88,14 @@
billVO.setHouse(houseService.getById(contract.getHouseId()));
billVO.setMonthRent(contract.getMonthRent());
billVO.setPayType(contract.getPayType());
+ billVO.setDeposit(contract.getDeposit());
+ billVO.setPartyOnePerson(contract.getPartyOnePerson());
+ billVO.setPartyOnePhone(contract.getPartyOnePhone());
+ billVO.setConcatStartTime(contract.getStartTime());
+ billVO.setConcatEndTime(contract.getEndTime());
});
billVO.setBillType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_BILL_TYPE,billVO.getBillType()));
- billVO.setPayFeesStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_PAY_FEES_STATUS,billVO.getPayFeesStatus()));
+// billVO.setPayFeesStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_PAY_FEES_STATUS,billVO.getPayFeesStatus()));
return R.ok(billVO);
}
@@ -119,8 +122,7 @@
@PostMapping(value = "/invoiceList")
public R<PageInfo<TBillDto>> invoiceList(@RequestBody TBillQuery query) {
-// Long userId = tokenService.getLoginUser().getUserId();
- String userId = "1881967035070177281";
+ String userId = tokenService.getLoginUserApplet().getUserId();
query.setUserId(userId);
PageInfo<TBillDto> pageInfo = tBillService.invoiceList(query);
return R.ok(pageInfo);
--
Gitblit v1.7.1