2024年9月9日16:08:47

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/dto/FinancingProcurement.java

@@ -65,7 +65,7 @@ public class FinancingProcurement {
 	/**
 	 * 供应商
 	 */
-	@ExcelIgnore
+	@ExcelProperty(value = "供应商")
 	private String customerName;
 
 	/**

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjOrder.java

@@ -470,6 +470,11 @@ public class PjOrder implements Serializable {
 	@ApiModelProperty(value = "融资金额")
 	private BigDecimal fundingAmount;
 	/**
+	 * 原融资金额
+	 */
+	@ApiModelProperty(value = "原融资金额")
+	private BigDecimal primaryFundingAmount;
+	/**
 	 * 保证金
 	 */
 	@ApiModelProperty(value = "保证金")

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/funding/entity/PjpfFunding.java

@@ -116,6 +116,11 @@ public class PjpfFunding implements Serializable {
 	@ApiModelProperty(value = "在库融资金额")
 	private BigDecimal surplusFundingAmount;
 	/**
+	 * 原融资金额
+	 */
+	@ApiModelProperty(value = "原融资金额")
+	private BigDecimal primaryFundingAmount;
+	/**
 	 * 保证金
 	 */
 	@ApiModelProperty(value = "保证金")

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/check/service/impl/AuditProecessServiceImpl.java

@@ -439,6 +439,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, P
 						BigDecimal fundingAmount = order.getSalesAmount().multiply(b)
 							.setScale(2, RoundingMode.HALF_UP);
 						pjpfFunding.setSurplusFundingAmount(pjpfFunding.getSurplusFundingAmount().add(fundingAmount));
+						pjpfFunding.setPrimaryFundingAmount(pjpfFunding.getPrimaryFundingAmount().add(fundingAmount));
 						pjpfFunding.setBondAmount(pjpfFunding.getBondAmount().add(bondAmount));
 						pjpfFunding.setPaidAlreadyBondAmount(pjpfFunding.getPaidAlreadyBondAmount().add(bondAmount));
 						pjpfFunding.setAmount(pjpfFunding.getSurplusFundingAmount().add(pjpfFunding.getBondAmount()));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderMapper.xml

@@ -751,6 +751,7 @@
     <select id="financingProcurement" resultType="org.springblade.salesPart.dto.FinancingProcurement">
         SELECT
             ord_no AS ordNo,
+            customer_name AS customerName,
             total_money AS totalMoney,
             proportion AS proportion,
             bond_amount AS bondAmount,
@@ -793,6 +794,7 @@
     <select id="financingProcurementList" resultType="org.springblade.salesPart.dto.FinancingProcurement">
         SELECT
         ord_no AS ordNo,
+        customer_name AS customerName,
         total_money AS totalMoney,
         proportion AS proportion,
         bond_amount AS bondAmount,

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -2848,12 +2848,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					(new BigDecimal(arr[1]).divide(new BigDecimal("10"), MathContext.DECIMAL32)
 						.setScale(2, RoundingMode.HALF_UP)));
 				order.setFundingAmount(actualFundingAmount);
+				order.setPrimaryFundingAmount(actualFundingAmount);
 				BigDecimal primaryBondAmount = order.getSalesAmount().multiply(
 					(new BigDecimal(arr[0]).divide(new BigDecimal("10"), MathContext.DECIMAL32)
 						.setScale(2, RoundingMode.HALF_UP)));
 				BigDecimal primaryFundingAmount = order.getSalesAmount().multiply(
 					(new BigDecimal(arr[1]).divide(new BigDecimal("10"), MathContext.DECIMAL32)
 						.setScale(2, RoundingMode.HALF_UP)));
+				pjpfFunding.setPrimaryFundingAmount(pjpfFunding.getPrimaryFundingAmount().add(actualFundingAmount).subtract(primaryFundingAmount));
 				pjpfFunding.setSurplusFundingAmount(pjpfFunding.getSurplusFundingAmount().add(actualFundingAmount).subtract(primaryFundingAmount));
 				pjpfFunding.setBondAmount(pjpfFunding.getBondAmount().add(actualBondAmount).subtract(primaryBondAmount));
 				pjpfFunding.setPaidAlreadyBondAmount(pjpfFunding.getPaidAlreadyBondAmount().add(actualBondAmount).subtract(primaryBondAmount));
@@ -2942,6 +2944,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					(new BigDecimal(arr[1]).divide(new BigDecimal("10"), MathContext.DECIMAL32)
 						.setScale(2, RoundingMode.HALF_UP)));
 				order.setFundingAmount(primaryFundingAmount);
+				order.setPrimaryFundingAmount(actualFundingAmount);
+				pjpfFunding.setPrimaryFundingAmount(pjpfFunding.getPrimaryFundingAmount().subtract(actualFundingAmount).add(primaryFundingAmount));
 				pjpfFunding.setSurplusFundingAmount(pjpfFunding.getSurplusFundingAmount().subtract(actualFundingAmount).add(primaryFundingAmount));
 				pjpfFunding.setBondAmount(pjpfFunding.getBondAmount().subtract(actualBondAmount).add(primaryBondAmount));
 				pjpfFunding.setPaidAlreadyBondAmount(pjpfFunding.getPaidAlreadyBondAmount().subtract(actualBondAmount).add(primaryBondAmount));
@@ -3018,7 +3022,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				.eq(PjOrderItems::getPid, pjOrder.getId());
 			List<PjOrderItems> itemsList = orderItemsService.list(itemsLambdaQueryWrapper);
 			long count = itemsList.stream().filter(e -> ObjectUtils.isNotNull(financingBrand) && financingBrand.contains(e.getBrandName())).count();
-			if (count > 1) {
+			if (count > 0) {
 				if ("审核提交".equals(order.getTaskWhetherAdopt())) {
 					throw new RuntimeException("任务已提交审核");
 				} else if ("审核中".equals(order.getTaskWhetherAdopt())) {
@@ -3665,7 +3669,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				order.setSalesAmount(new BigDecimal("0.00"));
 				order.setTotalMoney(new BigDecimal("0.00"));
 			}
-		} else if (order.getBsType().equals(OrderTypeEnum.PURCHASE.getType())) {
+		}
+		else if (order.getBsType().equals(OrderTypeEnum.PURCHASE.getType())) {
 			//采购
 			if (ObjectUtils.isNotNull(order.getStorageId())) {
 				order.setStorageName(storageDescMapper.selectById(order.getStorageId()).getCname());
@@ -3782,7 +3787,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				order.setSalesAmount(new BigDecimal("0.00"));
 				order.setTotalMoney(new BigDecimal("0.00"));
 			}
-		} else if (order.getBsType().equals(OrderTypeEnum.FINANCING.getType())) {
+		}
+		else if (order.getBsType().equals(OrderTypeEnum.FINANCING.getType())) {
 			//仓库名称
 			if (ObjectUtils.isNotNull(order.getStorageId())) {
 				order.setStorageName(storageDescMapper.selectById(order.getStorageId()).getCname());
@@ -3911,6 +3917,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					.setScale(2, RoundingMode.HALF_UP);
 				order.setBondAmount(bondAmount);
 				order.setFundingAmount(fundingAmount);
+				order.setPrimaryFundingAmount(fundingAmount);
 			}
 			order.setActualPaymentStatus(3);
 			order.setPaymentAmountTl(order.getTotalMoney());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/statistics/service/impl/StatisticsServiceImpl.java

@@ -1248,8 +1248,8 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			map.put("bondAmount", fundingList.stream().map(PjpfFunding::getBondAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
 			map.put("availableAmount", fundingList.stream().map(PjpfFunding::getAvailableAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
 			map.put("sumAmount", orderService.list(new LambdaQueryWrapper<PjOrder>().eq(PjOrder::getTenantId, AuthUtil.getTenantId())
-					.eq(PjOrder::getIsDeleted, 0).eq(PjOrder::getBsType, "RZCG").eq(PjOrder::getWhetherRedeem, 1))
-				.stream().map(PjOrder::getSalesAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+					.eq(PjOrder::getIsDeleted, 0).eq(PjOrder::getBsType, "RZCG").eq(PjOrder::getWhetherRedeem, 0))
+				.stream().map(PjOrder::getGoodsTotalShipAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
 		} else {
 			map.put("corpName", "");
 			map.put("surplusFundingAmount", "0.00");