Merge branch 'feature/20200518_预支付新增点餐类型'

order-application-service/pom.xml

@@ -320,12 +320,12 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>paymentcenter-sdk</artifactId>
-            <version>2.6.1.RELEASE</version>
+            <version>2.7.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.5.2-RELEASE</version>
+            <version>2.5.3-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.rocketmq</groupId>

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

@@ -2290,22 +2290,33 @@ public class OrderAdapter {
         }
         orderPayDto.setProducts(productBeans);
         orderPayDto.setPayCode(paymentRequest.getPayCode());
+        orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType()));
         return orderPayDto;
     }
 
-/*    public CancelOrderRequest convent2CancelOrderRequest(String orderId, String partnerId, AfterSalesType afterSalesType,
-                                                         String reason, String trackingNo, Long refund_id) {
-        CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
-        cancelOrderRequest.setOrderId(orderId);
-        cancelOrderRequest.setPartnerId(partnerId);
-        cancelOrderRequest.setAfterSalesType(afterSalesType);
-        cancelOrderRequest.setReason(reason);
-        cancelOrderRequest.setTrackingNo(trackingNo);
-        if (refund_id != null) {
-            cancelOrderRequest.setRefundSerialNo(refund_id.toString());
+
+    /**
+     * 预支付接口获取类型
+     * @return
+     */
+    private String getFoodOrderType(Integer orderType) {
+        //1=外卖 4=自提，5=堂食
+        //qr_order（店内扫码点餐）,pre_order（预点到店自提）,home_delivery （外送到家）
+        String foodOrderType;
+        switch (orderType) {
+            case 1:
+                foodOrderType = "home_delivery";
+                break;
+            case 4:
+                foodOrderType = "pre_order";
+                break;
+            case 5:
+            default:
+                foodOrderType = "qr_order";
+                break;
         }
-        return cancelOrderRequest;
-    }*/
+        return foodOrderType;
+    }
 
     public OrderPayResponse getOrderPayResponse(String partnerId, PaymentRequest paymentRequest, String orderId, String fmId) {
         OrderPayResponse orderPayResponse = new OrderPayResponse();