Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/DeclareCustomsServiceImpl.java

@@ -497,14 +497,13 @@ public class DeclareCustomsServiceImpl extends ServiceImpl<DeclareCustomsMapper,
 			receivableLambdaQueryWrapper.eq(DeclareCustomsFees::getPid, declare.getId());
 			receivableLambdaQueryWrapper.eq(DeclareCustomsFees::getFeesType, 2);
 			List<DeclareCustomsFees> receivableOrderFeesList = feesMapper.selectList(receivableLambdaQueryWrapper);
-			BigDecimal payAmount = new BigDecimal("0.00");
 			if (ObjectUtils.isNotNull(receivableOrderFeesList)) {
-				for (DeclareCustomsFees fees : receivableOrderFeesList) {
-					payAmount = payAmount.add(fees.getAmount());
-					//payAmount = payAmount.add(fees.getPrice().multiply(fees.getExchangeRate(), MathContext.DECIMAL32));
-				}
+				auditProecessDTO.setPayAmount(receivableOrderFeesList.stream().map(DeclareCustomsFees::getAmount).
+					filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+			}else {
+				auditProecessDTO.setPayAmount(BigDecimal.ZERO);
 			}
-			auditProecessDTO.setPayAmount(payAmount);
+
 			//应收
 			LambdaQueryWrapper<DeclareCustomsFees> payLambdaQueryWrapper = new LambdaQueryWrapper<>();
 			payLambdaQueryWrapper.eq(DeclareCustomsFees::getIsDeleted, 0);
@@ -512,14 +511,12 @@ public class DeclareCustomsServiceImpl extends ServiceImpl<DeclareCustomsMapper,
 			payLambdaQueryWrapper.eq(DeclareCustomsFees::getPid, declare.getId());
 			payLambdaQueryWrapper.eq(DeclareCustomsFees::getFeesType, 1);
 			List<DeclareCustomsFees> payOrderFeesList = feesMapper.selectList(payLambdaQueryWrapper);
-			BigDecimal receivableAmount = new BigDecimal("0.00");
 			if (ObjectUtils.isNotNull(payOrderFeesList)) {
-				for (DeclareCustomsFees DeclareCustomsFees : payOrderFeesList) {
-					receivableAmount = receivableAmount.add(DeclareCustomsFees.getAmount());
-					//receivableAmount = receivableAmount.add(DeclareCustomsFees.getPrice().multiply(DeclareCustomsFees.getExchangeRate(), MathContext.DECIMAL32));
-				}
+				auditProecessDTO.setReceivableAmount(payOrderFeesList.stream().map(DeclareCustomsFees::getAmount).
+					filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+			}else {
+				auditProecessDTO.setReceivableAmount(BigDecimal.ZERO);
 			}
-			auditProecessDTO.setReceivableAmount(receivableAmount);
 
 			auditProecessDTO.setMorderNo(declare.getContractAgreementNo());
 			auditProecessDTO.setOrderRemark(declare.getRemark());//订单备注

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/SettlementController.java

@@ -376,8 +376,7 @@ public class SettlementController extends BladeController {
 	/**
 	 * 新增或修改 结算表
 	 */
-	@PostMapping("/" +
-		"")
+	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入settlement")
 	public R submit(@Valid @RequestBody Settlement settlement) {