融资采购 确认赎回接口修改

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

@@ -1620,8 +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.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>()
@@ -1638,10 +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()))
+				/*	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)));
+						.map(PjOrderItems::getReturnsAmount).reduce(BigDecimal.ZERO, BigDecimal::add)));*/
 					item.setRefundType("线下退款");
 				}
 				orderItemsService.updateBatchById(pjOrderItems);
@@ -1714,8 +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()));
+//		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 {
@@ -1740,10 +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()))
+					/*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)));
+						.map(PjOrderItems::getReturnsAmount).reduce(BigDecimal.ZERO, BigDecimal::add)));*/
 					if (new BigDecimal("0.00").compareTo(item.getReturnsNumber()) == 0) {
 						item.setRefundType("线下退款");
 					}
@@ -3024,7 +3024,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 							&& ObjectUtils.isNull(e.getDot())).collect(Collectors.toList());
 				}
 				if (!stockDescList.isEmpty()) {
-					BigDecimal redeemNum = item.getSendNum().subtract(item.getOutGoodsTotalShipNum());
+					BigDecimal redeemNum = item.getSendNum().subtract(item.getOutGoodsTotalShipNum()).subtract(item.getReturnsNumber());
 					item.setRedeemNum(redeemNum);
 					BigDecimal balanceQuantityFinancing = stockDescList.stream().map(PjStockDesc::getBalanceQuantityFinancing)
 						.reduce(BigDecimal.ZERO, BigDecimal::add);