bugfix 创建配送单传优惠信息，预期时间-8

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

@@ -2,6 +2,7 @@ package cn.freemud.adapter;
 
 import cn.freemud.base.util.DateUtil;
 import cn.freemud.entities.dto.QueryOrdersResponseDto;
+import cn.freemud.entities.vo.CreateDeliveryPreferentialVo;
 import cn.freemud.entities.vo.CreateDeliveryVo;
 import cn.freemud.entities.vo.ProductInfo;
 import cn.freemud.enums.DeliveryChannelEnum;
@@ -13,6 +14,7 @@ import com.freemud.application.sdk.api.deliverycenter.dto.CreateDeliveryOrderReq
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType;
+import com.freemud.sdk.api.assortment.order.enums.QueryOrderAccountType;
 import com.freemud.sdk.api.assortment.order.request.order.CreateOrderProductRequest;
 import com.freemud.sdk.api.assortment.order.request.order.OrderProductAddInfoDto;
 import org.apache.commons.collections4.CollectionUtils;
@@ -26,6 +28,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static java.util.stream.Collectors.toList;
+
 @Component
 public class DeliveryAdapter {
 
@@ -156,10 +160,11 @@ public class DeliveryAdapter {
         deliveryOrderRequestDto.setIsLargeOrder(0);
         if (deliveryOrderRequestDto.getIsPre()== 1 && deliveryOrderRequestDto.getExpectTime() !=null){
             deliveryOrderRequestDto.setIsImmediateDelivery(0);
-            deliveryOrderRequestDto.setExpectDeliveryTimeByUTC(simpleDateFormat.format(deliveryOrderRequestDto.getExpectTime()));
+            deliveryOrderRequestDto.setExpectDeliveryTimeByUTC(simpleDateFormat.format(DateUtil.addHours(deliveryOrderRequestDto.getExpectTime(), -8)));
         }else {
             deliveryOrderRequestDto.setIsImmediateDelivery(1);
-            String expectDeliveryTimeByUTC = order.getGmtCreate() !=null ? simpleDateFormat.format(DateUtil.addMinutes(new Date(order.getGmtCreate()),30)) :null;
+            String expectDeliveryTimeByUTC = order.getGmtCreate() !=null ?
+                    simpleDateFormat.format(DateUtil.addHours(DateUtil.addMinutes(new Date(order.getGmtCreate()),30), -8)) :null;
             deliveryOrderRequestDto.setExpectDeliveryTimeByUTC(expectDeliveryTimeByUTC);
         }
         //---麦咖啡餐道专用---
@@ -187,6 +192,21 @@ public class DeliveryAdapter {
         }
         deliveryOrderRequestDto.setProductInfos(productInfos);
         deliveryOrderRequestDto.setOrderSource(OrderSourceType.ALIPAY.getCode().equals(order.getSource())?"Alipay":"freemud");
+        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())) {
+                    CreateDeliveryPreferentialVo createDeliveryPreferentialVo = new CreateDeliveryPreferentialVo();
+                    createDeliveryPreferentialVo.setPreferentialContent(accountBean.getName());
+                    createDeliveryPreferentialVo.setPreferentialPrice(accountBean.getPrice());
+                    createDeliveryPreferentialVos.add(createDeliveryPreferentialVo);
+                }
+            });
+            deliveryOrderRequestDto.setPreferentials(createDeliveryPreferentialVos);
+        }
         return deliveryOrderRequestDto;
     }
 

order-application-service/src/main/java/cn/freemud/entities/vo/CreateDeliveryPreferentialVo.java

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class CreateDeliveryPreferentialVo {
+
+    //优惠内容
+    private String preferentialContent;
+
+    //优惠价格
+    private Long preferentialPrice;
+
+
+}

order-application-service/src/main/java/cn/freemud/entities/vo/CreateDeliveryVo.java

@@ -16,6 +16,11 @@ public class CreateDeliveryVo {
     private List<ProductInfo> productInfos;
 
     /**
+     * 优惠信息
+     */
+    private List<CreateDeliveryPreferentialVo> preferentials;
+
+    /**
      * 取餐号
      * serialNumber不能为空
      */