|
@@ -230,7 +230,7 @@ public class BizPaymentController extends BaseController {
|
|
payment.setContractAmount(archiveInput.getTrueAmount());
|
|
payment.setContractAmount(archiveInput.getTrueAmount());
|
|
BizPayment payemntConditions = new BizPayment();
|
|
BizPayment payemntConditions = new BizPayment();
|
|
payemntConditions.setContractId(archiveInput.getId());
|
|
payemntConditions.setContractId(archiveInput.getId());
|
|
- payemntConditions.setVerifyStatus((byte)1);
|
|
|
|
|
|
+ payemntConditions.setPaymentStatus((byte)1);
|
|
List<BizPayment> payed = paymentService.getListByBean(payemntConditions);
|
|
List<BizPayment> payed = paymentService.getListByBean(payemntConditions);
|
|
// payment.setNonpayment(archiveInput.getAmount().subtract(BigDecimal.valueOf(collections.stream().mapToDouble(v -> v.getAmount().doubleValue()).sum())).compareTo(BigDecimal.ZERO) > 0);
|
|
// payment.setNonpayment(archiveInput.getAmount().subtract(BigDecimal.valueOf(collections.stream().mapToDouble(v -> v.getAmount().doubleValue()).sum())).compareTo(BigDecimal.ZERO) > 0);
|
|
payment.setPayedAmount(BigDecimal.valueOf(payed.stream().mapToDouble(v -> v.getAmount().doubleValue()).sum()));
|
|
payment.setPayedAmount(BigDecimal.valueOf(payed.stream().mapToDouble(v -> v.getAmount().doubleValue()).sum()));
|
|
@@ -255,7 +255,7 @@ public class BizPaymentController extends BaseController {
|
|
@ApiOperation("审核")
|
|
@ApiOperation("审核")
|
|
@PostMapping("/verified")
|
|
@PostMapping("/verified")
|
|
@Log(title = "支付审核", businessType = BusinessType.UPDATE)
|
|
@Log(title = "支付审核", businessType = BusinessType.UPDATE)
|
|
- @PreAuthorize("@ss.hasPermi('business:payment:submitVerify')")
|
|
|
|
|
|
+ @PreAuthorize("@ss.hasAnyPermi('business:payment:submitVerify,business:payment:financialVerify,business:payment:cashierVerify')")
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public AjaxResult verified(@RequestBody BizPayment payment) {
|
|
public AjaxResult verified(@RequestBody BizPayment payment) {
|
|
try {
|
|
try {
|