发货判断

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

@@ -139,9 +139,11 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 		List<DeliveryItems> collect = deliveryItemsList.stream().filter(e -> e.getGoodType() == 0).collect(Collectors.toList());//发货商品
 		List<DeliveryItems> itemsList = deliveryItemsList.stream().filter(e -> e.getGoodType() == 1).collect(Collectors.toList());//赠送商品
 		//判断要发货物的金额和已收金额的大小
-		R amount = this.deliveryAmount(collect, delivery.getTradeType());
-		if (!amount.isSuccess()){
-			throw  new RuntimeException(amount.getMsg());
+		if (delivery.getDeliveryType() == DeliveryEnum.DELIVER.getType()){
+			R amount = this.deliveryAmount(collect, delivery.getTradeType());
+			if (!amount.isSuccess()){
+				throw  new RuntimeException(amount.getMsg());
+			}
 		}
 		if (CollectionUtils.isNotEmpty(collect)){
 			for (DeliveryItems deliveryItems : collect) {