java/xizang.git

			@@ -3,11 +3,9 @@

			import com.ruoyi.common.basic.PageInfo;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.exception.ServiceException;
			import com.ruoyi.common.utils.SecurityUtils;
			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.model.TContract;
			@@ -19,10 +17,17 @@
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.security.access.prepost.PreAuthorize;
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.*;
			import org.springframework.web.bind.annotation.GetMapping;
			import org.springframework.web.bind.annotation.PostMapping;
			import org.springframework.web.bind.annotation.RequestBody;
			import org.springframework.web.bind.annotation.RequestMapping;
			import org.springframework.web.bind.annotation.RequestParam;
			import org.springframework.web.bind.annotation.RestController;

			import javax.validation.constraints.NotEmpty;
			import java.math.BigDecimal;
			import java.util.List;
			import java.util.Objects;

			/**
			* <p>
			@@ -48,6 +53,8 @@

			@Autowired
			TContractService contractService;
			@Autowired
			TPayOrderService tPayOrderService;

			@PreAuthorize("@ss.hasPermi('bill:list')")
			@PostMapping("list")
			@@ -56,6 +63,14 @@
			query.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
			PageInfo<TBillDto> pageInfo = tBillService.queryPage(query);
			return R.ok(pageInfo);
			}

			@ApiOperation("统计")
			@PostMapping("statistics")
			public R<BillStatisticsDto> statistics(@RequestBody TBillQuery query){
			query.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
			BillStatisticsDto dto = tBillService.statistics(query);
			return R.ok(dto);
			}


			@@ -70,8 +85,31 @@
			@PostMapping("add")
			@ApiOperation("新增账单")
			public R<PageInfo<TBillDto>> add(@Validated @RequestBody TbillSaveDto bill){
			bill.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
			String businessDeptId = SecurityUtils.getBusinessDeptId();
			if (SecurityUtils.getBusinessDeptId().equals("0")) {
			TContract contract = contractService.getById(bill.getContractId());
			if (Objects.nonNull(contract)) {
			businessDeptId = contract.getBusinessDeptId();
			}
			}
			bill.setBusinessDeptId(businessDeptId);
			tBillService.saveBill(bill);
			return R.ok();
			}


			@PreAuthorize("@ss.hasPermi('bill:list:editAmount')")
			@PostMapping("editAmount")
			@ApiOperation("修改账单金额")
			public R editAmount(@Validated @RequestBody TbillSaveDto bill){
			if (StringUtils.isEmpty(bill.getId())){
			return R.fail("参数错误");
			}
			if (bill.getEditAmount().compareTo(BigDecimal.ZERO)==0){
			return R.fail("调整金额不能为0");
			}

			tBillService.editAmount(bill);
			return R.ok();
			}

			@@ -134,11 +172,11 @@
			}


			@ApiOperation("统计")
			@GetMapping("statistics")
			public R<BillStatisticsDto> statistics(){
			BillStatisticsDto dto = tBillService.statistics(SecurityUtils.getBusinessDeptId());
			return R.ok(dto);
			@ApiOperation(value = "创建支付订单、二维码支付")
			@PostMapping("makeOrder")
			public R<MakeOrderResp> makeOrder(@Validated @RequestBody MakeOrderDto dto){
			MakeOrderResp resp = tPayOrderService.makeOrder(dto);
			return R.ok(resp);
			}