java/xizang.git

			@@ -4,10 +4,13 @@
			import com.ruoyi.common.basic.PageInfo;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.exception.ServiceException;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.system.dto.*;
			import com.ruoyi.system.model.TBill;
			import com.ruoyi.system.model.TBillConfirm;
			import com.ruoyi.system.model.TBillDetail;
			import com.ruoyi.system.query.TBillQuery;
			import com.ruoyi.system.service.TBillConfirmService;
			import com.ruoyi.system.service.TBillDetailService;
			import com.ruoyi.system.service.TBillService;
			import io.swagger.annotations.Api;
			@@ -39,6 +42,8 @@
			@Autowired
			TBillDetailService tBillDetailService;

			@Autowired
			TBillConfirmService tBillConfirmService;

			@PreAuthorize("@ss.hasPermi('bill:list')")
			@PostMapping("list")
			@@ -58,7 +63,10 @@

			@ApiOperation("通过ID查找详情")
			@GetMapping("getDetailById")
			public R<TBillDto> getDetailById(@Validated @NotEmpty String id){
			public R<TBillDto> getDetailById(@RequestParam String id){
			if (StringUtils.isEmpty(id)){
			return R.fail();
			}
			TBillDto dto = tBillService.getDetailByBillId(id);
			if (dto.getBillType().equals("3")){
			List<TBillDetail> details = tBillDetailService.getByBillId(id);
			@@ -66,6 +74,10 @@
			if (detail.getLiveType()==1)dto.setWater(detail); //水费
			else dto.setElect(detail); //电费
			}
			}
			if (StringUtils.isNotEmpty(dto.getConfirmId())){
			TBillConfirm confirm = tBillConfirmService.getById(dto.getConfirmId());
			dto.setConfirm(confirm);
			}
			return R.ok(dto);
			}
			@@ -96,10 +108,14 @@
			return R.ok(failNum);
			}




			@PreAuthorize("@ss.hasPermi('bill:list:receipt')")
			@ApiOperation("收款")
			@PostMapping("cashPay")
			public R cashPay(@RequestBody OfflinePayDto offlinePayDto){
			public R cashPay(@RequestBody CachPayDto cachPayDto){
			tBillService.cashPay(cachPayDto);
			return null;
			}