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

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

@@ -140,8 +140,10 @@ public class DeliveryAdapter {
         // 预约单预计送到时间
         if (order.getGmtExpect() != null && order.getGmtExpect() != 0) {
             deliveryOrderRequestDto.setExpectTime(new Date(order.getGmtExpect()));
+            deliveryOrderRequestDto.setIsPre(1);
+        } else {
+            deliveryOrderRequestDto.setIsPre(0);
         }
-        deliveryOrderRequestDto.setIsPre(order.getType() == OrderType.PRE_ORDER.getCode() ? 1 : 0);
 
         //---麦咖啡餐道专用---
         deliveryOrderRequestDto.setDisplayOrderId(displayOrderId);
@@ -214,10 +216,8 @@ public class DeliveryAdapter {
         if(CollectionUtils.isNotEmpty(order.getAccountList())) {
             List<CreateDeliveryPreferentialVo> createDeliveryPreferentialVos = new ArrayList<>();
             order.getAccountList().stream().forEach(accountBean -> {
-                if (!OldOrderAccountType.DELIVERY_AMOUNT.getCode().equals(accountBean.getType())
-                        && !OldOrderAccountType.PACK_AMOUNT.getCode().equals(accountBean.getType())
-                        && !OldOrderAccountType.CARD_ORIGINAL_AMOUNT.getCode().equals(accountBean.getType())
-                        && !OldOrderAccountType.DRIVER_FEE.getCode().equals(accountBean.getType())) {
+                if (OldOrderAccountType.COUPON.getCode().equals(accountBean.getType())
+                        || OldOrderAccountType.BUY_DISCOUNT.getCode().equals(accountBean.getType())) {
                     CreateDeliveryPreferentialVo createDeliveryPreferentialVo = new CreateDeliveryPreferentialVo();
                     createDeliveryPreferentialVo.setPreferentialContent(accountBean.getName());
                     createDeliveryPreferentialVo.setPreferentialPrice(0-accountBean.getPrice());