添加列表返回值

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

@@ -25,4 +25,10 @@ public class QueryOrderByConditionsResponseVo {
     private Integer orderState;
     @ApiModelProperty(value = "审核状态value")
     private String orderStateValue;
+    @ApiModelProperty(value = "订单编号")
+    private String orderCode;
+    @ApiModelProperty(value = "上传图片")
+    private String imgUrl;
+    @ApiModelProperty(value = "取消原因")
+    private String cancelReason;
 }

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

@@ -13,25 +13,22 @@
 
 package cn.freemud.entities.vo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
 
 @Data
+@ApiModel
 public class QueryOrderVo {
-
+    @ApiModelProperty(value = "sessionId")
     @NotEmpty(message = "sessionId 不能为空")
     private String sessionId;
-    /**
-     * 操作类型  1.详情  2.围餐桌号订单信息
-     */
+    @ApiModelProperty(value = "操作类型  1.详情  2.围餐桌号订单信息")
     private Integer operation;
-    /**
-     * 商户ID
-     */
+    @ApiModelProperty(value = "商户Id")
     private String partnerId;
-    /**
-     * 订单ID
-     */
+    @ApiModelProperty(value = "订单编号")
     private String oid;
     /**
      * 订单状态 enum queryOrderStatus   全部订单 1 待取餐 2 已完成 3 全部   4.退款,5 待支付

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -133,6 +133,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.util.StringUtil;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
@@ -1363,7 +1364,7 @@ public class OrderServiceImpl implements Orderservice {
         req.setUserId(userInfo.getMemberId());
         req.setUserName(userInfo.getNickName());
         req.setPartnerId(vo.getPartnerId());
-        req.setImgUlr(vo.getImgUrl());
+        req.setImgUrl(vo.getImgUrl());
         req.setMobile(userInfo.getMobile());
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderResp> result = orderSdkService.parking_v2_create(req, LogThreadLocal.getTrackingNo());
         if (Objects.isNull(result)) {
@@ -2421,8 +2422,15 @@ public class OrderServiceImpl implements Orderservice {
                 orderBean -> {
                     QueryOrderByConditionsResponseVo queryOrderByConditionsResponseVo = new QueryOrderByConditionsResponseVo();
                     BeanUtil.convertBean(orderBean,queryOrderByConditionsResponseVo);
+                    String imgUrl = "";
+                    String extInfo = orderBean.getExtInfo();
+                    if(!StringUtil.isEmpty(extInfo)){
+                        JSONObject jsonObject = JSONObject.parseObject(extInfo);
+                        imgUrl = String.valueOf(jsonObject.get("imgUrl"));
+                    }
+                    queryOrderByConditionsResponseVo.setImgUrl(imgUrl);
                     queryOrderByConditionsResponseVo.setOrderStateValue(orderSdkAdapter.getOrderStatusValue(orderBean.getOrderState()));
-                    queryOrderByConditionsResponseVo.setCreateTime(DateUtil.convert2Str(DateUtil.convert2Date(orderBean.getCreateTime(),DateUtil.FORMAT_YMD),DateUtil.FORMAT_YMD));
+                    queryOrderByConditionsResponseVo.setCreateTime(DateUtil.convert2Str(DateUtil.convert2Date(orderBean.getCreateTime(),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
                     return queryOrderByConditionsResponseVo;
                 }
             ).collect(Collectors.toList());

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/carpark/ParkingOrderCreateReq.java

@@ -71,7 +71,7 @@ public class ParkingOrderCreateReq {
     /**
      * 发票图片
      */
-    private List<String> imgUlr;
+    private List<String> imgUrl;
     /**
      * 门店名称
      */