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

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

@@ -135,7 +135,7 @@ public class DeliveryAdapter {
         deliveryOrderRequestDto.setReceiverAddress(order.getAddress());
         deliveryOrderRequestDto.setReceiverLng(new BigDecimal(order.getLongitude()));
         deliveryOrderRequestDto.setReceiverLat(new BigDecimal(order.getLatitude()));
-        deliveryOrderRequestDto.setOrderTime(new Date(order.getGmtCreate()));
+        deliveryOrderRequestDto.setOrderTime(DateUtil.addHours(new Date(order.getGmtCreate()), -8));
         deliveryOrderRequestDto.setCallbackUrl(deliveryCallBackUrl);
         // 预约单预计送到时间
         if (order.getGmtExpect() != null && order.getGmtExpect() != 0) {
@@ -164,7 +164,7 @@ public class DeliveryAdapter {
         }else {
             deliveryOrderRequestDto.setIsImmediateDelivery(1);
             String expectDeliveryTimeByUTC = order.getGmtCreate() !=null ?
-                    simpleDateFormat.format(DateUtil.addHours(DateUtil.addMinutes(new Date(order.getGmtCreate()),30), -8)) :null;
+                    simpleDateFormat.format(DateUtil.addHours(DateUtil.addMinutes(new Date(order.getGmtCreate()),storeInfo.getBizVO().getServiceTime()), -8)) :null;
             deliveryOrderRequestDto.setExpectDeliveryTimeByUTC(expectDeliveryTimeByUTC);
         }
         //---麦咖啡餐道专用---
@@ -186,6 +186,24 @@ public class DeliveryAdapter {
                     deliveryProductInfo.setParentCode(Long.valueOf(productList.getParentProductId()) == 0l ? -1l : Long.valueOf(productList.getParentProductId()));
 
                     productInfos.add(deliveryProductInfo);
+
+                    if(CollectionUtils.isNotEmpty(productList.getComboProduct())) {
+                        productList.getComboProduct().forEach(comboProduct -> {
+                            ProductInfo deliveryComboProductInfo = new ProductInfo();
+                            deliveryComboProductInfo.setProductCode(comboProduct.getProductId());
+                            deliveryComboProductInfo.setProductName(comboProduct.getProductName());
+                            deliveryComboProductInfo.setProductNumber(comboProduct.getNumber());
+                            deliveryComboProductInfo.setProductPrice(comboProduct.getPrice().intValue());
+                            //餐道使用
+                            deliveryComboProductInfo.setCumulatedTotal(comboProduct.getNumber() * comboProduct.getPrice().intValue());
+                            OrderProductAddInfoDto orderComboProductAddInfoDto = JSON.parseObject(comboProduct.getAddInfo(), OrderProductAddInfoDto.class);
+                            deliveryComboProductInfo.setTaxId(StringUtils.isNotEmpty(orderComboProductAddInfoDto.getTaxId()) ? orderComboProductAddInfoDto.getTaxId() : "10");
+                            deliveryComboProductInfo.setTaxRate(orderComboProductAddInfoDto.getTax() > 0 ? orderComboProductAddInfoDto.getTax() : 6);
+                            deliveryComboProductInfo.setParentCode(Long.valueOf(comboProduct.getParentProductId()) == 0l ? -1l : Long.valueOf(comboProduct.getParentProductId()));
+
+                            productInfos.add(deliveryComboProductInfo);
+                        });
+                    }
                 }
             });
             deliveryOrderRequestDto.setProductTotal(productInfos.stream().mapToInt(t -> t.getCumulatedTotal()).sum());