提交财务修改

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/feign/IFinanceClient.java

@@ -30,7 +30,7 @@ public interface IFinanceClient
 	 R passCancel(@RequestParam("id") Long id);
 
     @GetMapping("/settlement/getFinanceAcc")
-	R<BigDecimal> getFinanceAcc(@RequestParam("accSysNo")String accSysNo);
+	R<BigDecimal> getFinanceAcc(@RequestParam("accSysNo")String accSysNo,@RequestParam("tradeType")String tradeType);
 
 	@GetMapping("/settlement/detail")
 	R<Settlement> detail(Settlement settlement);

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -547,7 +547,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				BigDecimal newDelivery = new BigDecimal(BigInteger.ZERO);//本次发货金额
 				BigDecimal oldDelivery = new BigDecimal(BigInteger.ZERO);//已发货金额
 				BigDecimal gathering = new BigDecimal(BigInteger.ZERO);//已收金额
-				R<BigDecimal> financeAcc = financeClient.getFinanceAcc(srcOrderNo);
+				R<BigDecimal> financeAcc = financeClient.getFinanceAcc(srcOrderNo,tradeType);
 				if (financeAcc.isSuccess() && financeAcc.getData() != null && financeAcc.getData().compareTo(BigDecimal.ZERO) >0){
 					gathering = financeAcc.getData();
 				}else {

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

@@ -321,12 +321,13 @@ public class SettlementController extends BladeController {
 	}
 
 	@GetMapping("/getFinanceAcc")
-	public R<BigDecimal> getFinanceAcc(@RequestParam(value = "accSysNo",required = true)String accSysNo)
+	public R<BigDecimal> getFinanceAcc(@RequestParam(value = "accSysNo",required = true)String accSysNo,@RequestParam(value = "tradeType",required = true)String tradeType)
 	{
 		LambdaQueryWrapper<Acc> accLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		accLambdaQueryWrapper
 			.eq(Acc::getAccSysNo,accSysNo)
 			.eq(Acc::getBillType,"收费")
+			 .eq(Acc::getTradeType,tradeType)
 			.eq(Acc::getTenantId,AuthUtil.getTenantId())
 			.eq(Acc::getIsDeleted,0);
 		List<Acc> accList = accService.list(accLambdaQueryWrapper);