java/xizang.git

			@@ -6,6 +6,7 @@
			import com.ruoyi.common.constant.DictConstants;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.exception.ServiceException;
			import com.ruoyi.common.utils.CodeGenerateUtils;
			import com.ruoyi.common.utils.DictUtils;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.framework.web.service.TokenService;
			@@ -21,6 +22,8 @@
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.web.bind.annotation.*;

			import java.time.LocalDateTime;
			import java.time.temporal.ChronoUnit;
			import java.util.ArrayList;
			import java.util.List;

			@@ -51,23 +54,30 @@
			TInvoiceToBillService invoiceToBillService;
			@Autowired
			TokenService tokenService;
			@Autowired
			TTenantService tenantService;

			@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);
			}

			@ApiOperation(value = "缴费账单查询分页列表")
			public static void main(String[] args) {
			LocalDateTime localDateTime1 = LocalDateTime.now().withYear(2025).withMonth(11).withDayOfMonth(1);
			LocalDateTime localDateTime2 = LocalDateTime.now().withYear(2025).withMonth(11).withDayOfMonth(28);
			long allDays = ChronoUnit.DAYS.between(localDateTime1, localDateTime2);
			System.err.println(allDays);
			}

			@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,15 +100,27 @@
			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);
			}

			@ApiOperation(value = "缴费账单开票")
			@PostMapping(value = "/invoice")
			public R<String> invoice(@RequestBody TInvoiceDTO dto) {
			String userId = tokenService.getLoginUserApplet().getUserId();
			dto.setApplyName(tenantService.getById(userId).getResidentName());
			String code;
			do {
			code = CodeGenerateUtils.generateVolumeSn();
			} while (invoiceService.count(Wrappers.lambdaQuery(TInvoice.class).eq(TInvoice::getInvoiceNumber, code)) > 0);
			dto.setInvoiceNumber(CodeGenerateUtils.generateVolumeSn());
			// 添加开票信息
			invoiceService.save(dto);

			@@ -119,8 +141,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);