2023年3月3日08:28:57

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/feign/DeliveryClient.java

@@ -115,7 +115,7 @@ public class DeliveryClient implements IDeliveryClient {
 			.eq(Delivery::getBillType, "FH")
 			.eq(Delivery::getTradeType, "CK")
 			.eq(Delivery::getSrcOrderNo, order.getOrderNo())
-			.eq(Delivery::getOrgOrderNo, order.getSysNo())
+			.eq(Delivery::getOrgOrderNo, order.getOrderNo())
 			.eq(Delivery::getOrgId, order.getId());
 		Delivery delivery1 = deliveryService.getOne(lambdaQueryWrapper);
 		if (ObjectUtils.isNotNull(delivery1)) {
@@ -153,7 +153,7 @@ public class DeliveryClient implements IDeliveryClient {
 			}
 			delivery.setSrcOrderNo(order.getOrderNo());
 			delivery.setSrcId(order.getId());
-			delivery.setOrgOrderNo(order.getSysNo());
+			delivery.setOrgOrderNo(order.getOrderNo());
 			delivery.setOrgId(order.getId());
 			delivery.setBillType("FH");
 			delivery.setTradeType("CK");
@@ -251,7 +251,7 @@ public class DeliveryClient implements IDeliveryClient {
 					deliveryItemsList.add(deliveryItems);
 				}
 			}
-			if (ObjectUtils.isNotNull(order.getOrderFeesList()) && order.getOrderFeesList().size() > 0) {
+			/*if (ObjectUtils.isNotNull(order.getOrderFeesList()) && order.getOrderFeesList().size() > 0) {
 				for (OrderFees orderFees : order.getOrderFeesList()) {
 					LambdaQueryWrapper<DeliveryFees> itemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
 					itemsLambdaQueryWrapper.eq(DeliveryFees::getIsDeleted, 0)
@@ -300,9 +300,9 @@ public class DeliveryClient implements IDeliveryClient {
 						deliveryFeesList.add(deliveryFees);
 					}
 				}
-			}
+			}*/
 			deliveryNew.setDeliveryItemsList(deliveryItemsList);
-			deliveryNew.setDeliveryFeesList(deliveryFeesList);
+//			deliveryNew.setDeliveryFeesList(deliveryFeesList);
 		}
 		return R.data(deliveryNew);
 	}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -5979,6 +5979,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.eq(Order::getTenantId, AuthUtil.getTenantId())
 			.ge(Order::getBusinesDate, order.getDateList().get(0))
 			.le(Order::getBusinesDate, order.getDateList().get(1))
+			.eq(Order::getBillType, "XS")
+			.eq(Order::getTradeType, "CK")
 			.ne(Order::getOrderStatus, "订单完成")
 		);
 		for (Order order1 : orderList) {