Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop

order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java

@@ -143,7 +143,7 @@ public class DeliveryAdapter {
         deliveryOrderRequestDto.setDisplayOrderId(displayOrderId);
         deliveryOrderRequestDto.setTaxFlag(1);
         if (CollectionUtils.isNotEmpty(order.getAccountList())) {
-            List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> collect = order.getAccountList().stream().filter(type -> type != null && type.equals(OldOrderAccountType.DELIVERY_AMOUNT.getCode())).collect(Collectors.toList());
+            List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> collect = order.getAccountList().stream().filter(account -> account != null && OldOrderAccountType.DELIVERY_AMOUNT.getCode().equals(account.getType())).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(collect)) {
                 //配送费
                 deliveryOrderRequestDto.setDeliveryTotal(collect.get(0).getPrice().intValue());