融资采购 售后退货单生成任务，撤销生成任务接口增加融资采购出库数量计算

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/excel/PjOrderExportExcelXS.java

@@ -108,6 +108,11 @@ public class PjOrderExportExcelXS implements Serializable {
 	@ExcelProperty(value = "金额")
 	private BigDecimal totalMoney;
 	/**
+	 * 已付金额
+	 */
+	@ExcelProperty(value = "已付金额")
+	private BigDecimal paymentAmountTl;
+	/**
 	 * 运费
 	 */
 	@ExcelProperty(value = "运费")

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

@@ -1620,6 +1620,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		selectOne.setRefundType("线下退款");
 		selectOne.setReturnsNumber(selectOne.getReturnsNumber().add(pjOrder.getReturnsNumber()));
 		selectOne.setReturnsAmount(selectOne.getReturnsAmount().add(pjOrder.getReturnsAmount()));
+		selectOne.setOutGoodsTotalShipNum(selectOne.getOutGoodsTotalShipNum().add(pjOrder.getReturnsNumber()));
+		selectOne.setOutGoodsTotalShipAmount(selectOne.getOutGoodsTotalShipAmount().add(pjOrder.getReturnsAmount()));
 		selectOne.setVersion(selectOne.getVersion() + 1);
 		baseMapper.updateById(selectOne);
 		List<PjOrderItems> pjOrderItemsList = orderItemsService.list(new LambdaQueryWrapper<PjOrderItems>()
@@ -1636,6 +1638,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 						.map(PjOrderItems::getReturnsNumber).reduce(BigDecimal.ZERO, BigDecimal::add)));
 					item.setReturnsAmount(item.getReturnsAmount().add(pjOrderItemsList.stream().filter(e -> e.getSrcItemId().equals(item.getId()))
 						.map(PjOrderItems::getReturnsAmount).reduce(BigDecimal.ZERO, BigDecimal::add)));
+					item.setOutGoodsTotalShipNum(item.getOutGoodsTotalShipNum().add(pjOrderItemsList.stream().filter(e -> e.getSrcItemId().equals(item.getId()))
+						.map(PjOrderItems::getReturnsNumber).reduce(BigDecimal.ZERO, BigDecimal::add)));
+					item.setOutGoodsTotalShipAmount(item.getOutGoodsTotalShipAmount().add(pjOrderItemsList.stream().filter(e -> e.getSrcItemId().equals(item.getId()))
+						.map(PjOrderItems::getReturnsAmount).reduce(BigDecimal.ZERO, BigDecimal::add)));
 					item.setRefundType("线下退款");
 				}
 				orderItemsService.updateBatchById(pjOrderItems);
@@ -1708,6 +1714,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		}
 		selectOne.setReturnsNumber(selectOne.getReturnsNumber().subtract(pjOrder.getReturnsNumber()));
 		selectOne.setReturnsAmount(selectOne.getReturnsAmount().subtract(pjOrder.getReturnsAmount()));
+		selectOne.setOutGoodsTotalShipNum(selectOne.getOutGoodsTotalShipNum().subtract(pjOrder.getReturnsNumber()));
+		selectOne.setOutGoodsTotalShipAmount(selectOne.getOutGoodsTotalShipAmount().subtract(pjOrder.getReturnsAmount()));
 		if (new BigDecimal("0.00").compareTo(selectOne.getReturnsNumber().subtract(pjOrder.getReturnsNumber())) == 0) {
 			selectOne.setReturnsStatus("无");
 		} else {
@@ -1732,6 +1740,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 						.map(PjOrderItems::getReturnsNumber).reduce(BigDecimal.ZERO, BigDecimal::add)));
 					item.setReturnsAmount(item.getReturnsAmount().subtract(pjOrderItemsList.stream().filter(e -> e.getSrcItemId().equals(item.getId()))
 						.map(PjOrderItems::getReturnsAmount).reduce(BigDecimal.ZERO, BigDecimal::add)));
+					item.setOutGoodsTotalShipNum(item.getOutGoodsTotalShipNum().subtract(pjOrderItemsList.stream().filter(e -> e.getSrcItemId().equals(item.getId()))
+						.map(PjOrderItems::getReturnsNumber).reduce(BigDecimal.ZERO, BigDecimal::add)));
+					item.setOutGoodsTotalShipAmount(item.getOutGoodsTotalShipAmount().subtract(pjOrderItemsList.stream().filter(e -> e.getSrcItemId().equals(item.getId()))
+						.map(PjOrderItems::getReturnsAmount).reduce(BigDecimal.ZERO, BigDecimal::add)));
 					if (new BigDecimal("0.00").compareTo(item.getReturnsNumber()) == 0) {
 						item.setRefundType("线下退款");
 					}