foodOrderType 对接支付宝上报需要新增

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -213,6 +213,8 @@ public class OrderCallBackMQService {
         wechatReportOrderDto.setShopId(orderInfoReqs.getStoreId());
         wechatReportOrderDto.setSubMchId(orderExtInfoDto.getPlatformMchId());
         wechatReportOrderDto.setGmtCreate(Long.parseLong(orderInfoReqs.getCreateTime()));
+        //字段赋值逻辑同支付预下单参数
+        wechatReportOrderDto.setFoodOrderType(getFoodOrderType(orderInfoReqs.getOrderType()));
         if (StringUtils.isBlank(orderExtInfoDto.getPlatformMchId())) {
             // 获取当前商户微信支付mchId
             AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(userLoginInfoDto.getPartnerId(), userLoginInfoDto.getWxAppid());
@@ -378,4 +380,33 @@ public class OrderCallBackMQService {
             logUtil.error("sendzfbOrderMQ orderCode:{} ", e,body.getOrderCode());
         }
     }
+
+    /**
+     * 同预支付接口获取类型
+     *
+     * @return
+     */
+    private String getFoodOrderType(Integer orderType) {
+        //1常规堂食",2预约堂食",3常规外送",4预约外送",5常规自取",6预约自取"
+        //qr_order（店内扫码点餐）,pre_order（预点到店自提）,home_delivery （外送到家）
+        String foodOrderType;
+        switch (orderType) {
+            case 1:
+            case 2:
+                foodOrderType = "qr_order";
+                break;
+            case 3:
+            case 4:
+                foodOrderType = "home_delivery";
+                break;
+            case 5:
+            case 6:
+                foodOrderType = "pre_order";
+                break;
+            default:
+                foodOrderType = "qr_order";
+                break;
+        }
+        return foodOrderType;
+    }
 }

call-back-service/src/main/java/cn/freemud/entities/dto/WechatReportOrderDto.java

@@ -95,6 +95,8 @@ public class WechatReportOrderDto {
      */
     private Long gmtCreate;
 
+    private String foodOrderType;
+
     private List<AccountBean> accountList;
 
     @Data