Merge remote-tracking branch 'origin/qa' into qa

call-back-service/pom.xml

@@ -71,7 +71,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-orderdistributor-sdk</artifactId>
-            <version>2.6.3-SNAPSHOT</version>
+            <version>2.9.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>

order-application-service/pom.xml

@@ -12,6 +12,7 @@
     <properties>
         <jacoco.version>0.7.5.201505241946</jacoco.version>
         <junit.version>4.12</junit.version>
+        <ordercenter-sdk.version>1.4.31-SNAPSHOT</ordercenter-sdk.version>
     </properties>
 
     <artifactId>order-application-service</artifactId>
@@ -40,7 +41,13 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.8-SNAPSHOT</version>
+            <version>2.0.7-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>ordercenter-sdk</artifactId>
+                    <groupId>cn.freemud</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -320,7 +327,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.5.4-RELEASE</version>
+            <version>2.5.5-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.rocketmq</groupId>
@@ -346,6 +353,11 @@
             <groupId>org.apache.skywalking</groupId>
             <artifactId>apm-toolkit-logback-1.x</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.freemud</groupId>
+            <artifactId>ordercenter-sdk</artifactId>
+            <version>${ordercenter-sdk.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -268,4 +268,12 @@ public class OrderController {
         return orderservice.newPaySuccessCallback(message);
     }
 
+    @ApiOperation(value = "创建积分订单", notes = "创建积分订单", produces = "application/json")
+    @ApiAnnotation(logMessage = "createIntegralOrder")
+    @PostMapping("/createIntegralOrder")
+    public BaseResponse createIntegralOrder(@Validated @LogParams @RequestBody IntegralOrderVo request) {
+        return orderservice.createIntegralOrder(request);
+    }
+
+
 }

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

+package cn.freemud.entities.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.com
+ *
+ * @version V1.0
+ * @Description: 积分订单
+ * @author: hongwang.zhang
+ * @date: 2020-01-07 19:43:40
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目.
+ */
+@Setter
+@Getter
+@ToString
+public class IntegralOrderVo {
+
+    @NotEmpty(message = "图片url,不能为空")
+    @ApiModelProperty(value = "图片url")
+    private List<String> imgUrl;
+
+    @NotBlank(message = "商户id 不能为空")
+    @ApiModelProperty(value = "商户号")
+    private String partnerId;
+
+    @NotNull(message = "业务类型不能为空")
+    @ApiModelProperty(value = "默认不填=99,订单业务类型 1:普通订单 2:虚拟订单 3:会员订单 4:积分商城订单 5:储值卡订单 6:卖券订单,97:自助录单 98:农工商停车手工录单 99:农工商停车订单")
+    private Byte bizType;
+
+    /**
+     * 用户sessionId
+     */
+    @NotEmpty(message = "用户sessionId 不能为空")
+    @ApiModelProperty(value = "用户sessionId")
+    private String sessionId;
+
+
+}

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -103,4 +103,11 @@ public interface Orderservice {
     BaseResponse getRefundReason(GetRefundReasonVo getRefundReasonVo);
 
     BaseResponse getNewRefundReason(GetRefundReasonVo getRefundReasonVo);
+
+    /**
+     * 创建积分订单
+     * @param vo
+     * @return
+     */
+    BaseResponse createIntegralOrder(IntegralOrderVo vo);
 }

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

@@ -79,6 +79,9 @@ import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
+import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderCreateReq;
+import com.freemud.application.sdk.api.ordercenter.response.carpark.OrderResp;
+import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.paymentcenter.client.request.CodePayRequest;
 import com.freemud.application.sdk.api.paymentcenter.client.request.SVCCardAmountRequest;
 import com.freemud.application.sdk.api.paymentcenter.client.response.CodePayResponse;
@@ -224,6 +227,8 @@ public class OrderServiceImpl implements Orderservice {
     private OrderAdapterService orderAdapterService;
     @Autowired
     private AssortmentOpenPlatformPartnerManager assortmentOpenPlatformPartnerManager;
+    @Autowired
+    private OrderSdkService orderSdkService;
 
     @Override
     public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
@@ -1350,6 +1355,29 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.success(result);
     }
 
+    @Override
+    public BaseResponse createIntegralOrder(IntegralOrderVo vo) {
+        AssortmentCustomerInfoVo userInfo = customerInfoManager.getCustomerInfoByObject(vo.getSessionId());
+        if (userInfo == null || StringUtils.isEmpty(userInfo.getMemberId())) {
+            return ResponseUtil.error(ResponseResult.NOT_LOGIN);
+        }
+        ParkingOrderCreateReq req = new ParkingOrderCreateReq();
+        req.setBizType(vo.getBizType());
+        req.setUserId(userInfo.getMemberId());
+        req.setUserName(userInfo.getNickName());
+        req.setPartnerId(vo.getPartnerId());
+        req.setImgUlr(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)) {
+            return new BaseResponse(ResponseResultEnum.SYSTEM_ERROR.getCode(), ResponseResultEnum.SYSTEM_ERROR.getMessage(), "", null);
+        }
+        if (!ResponseResultEnum.SUCCESS.getCode().equalsIgnoreCase(result.getCode()) || Objects.isNull(result.getResult())) {
+            return new BaseResponse(result.getCode(), result.getMessage(), "", null);
+        }
+        return ResponseUtil.success();
+    }
+
     private String buildRefundDocument(String oid) {
         QueryOrderByIdResponseDto response = getQueryOrderByIdResponseDto(oid);
         if (!RESPONSE_SUCCESS_CODE.equals(response.getErrcode()) || response.getData() == null) {

order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@FeignClient(name = "ACTIVITY-APPLICATION-SERVICE", url = "${saas.activityapplicationclient.feign.url}")
+@FeignClient(name = "ACTIVITY-APPLICATION-SERVICE")
 @RequestMapping(produces = {"application/json;charset=UTF-8"})
 public interface ActivityApplicationClient {
 

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.3.13-SNAPSHOT</version>
+    <version>1.4.31-SNAPSHOT</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -54,4 +54,35 @@
 | 1.3.8.RELEASE | 增加小程序场景值 | 李小二 | 2020-07-01 |
 | 1.3.9.RELEASE | 增加支付渠道编号 | 李小二 | 2020-07-08 |
 | 1.3.10.RELEASE | OrderExtInfoDto新增parkingAreaName | wuping | 2020-07-13 |
-| 1.3.14-SNAPSHOT | es综合查询新增appId查询条件 | wuping | 2020-06-30 |
+| 1.3.14-SNAPSHOT | es综合查询新增appId查询条件 | wuping | 2020-06-30 |
\ No newline at end of file
+|1.4.31-SNAPSHOT | 增加手动录单，和完成订单接口 |张虹旺| 2020-07-18  
+        | 1.1.9.RELEASE | 满额减配送费RELEASE | dingkai | 2020-03-26 |
+        | 1.2.0.RELEASE | 新增订单商品汇总下载接口 | 侯书虎 | 2020-04-07 |
+        | 1.2.1.RELEASE | oms接单 | 侯书虎 | 2020-04-13 |
+        | 1.2.2.RELEASE | 新增真实配送费 | 海波 | 2020-04-27 |
+        | 1.2.2.RELEASE | ES查询增加异常单状态 | 李小二 | 2020-04-27 |
+        | 1.2.3.RELEASE | 配送费实际金额 | 胡超 | 2020-05-11 |
+        | 1.2.4.RELEASE | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-11 |
+        | 1.2.5.RELEASE | 取消接口新增超时时间字段 | wuping | 2020-05-12 |
+        | 1.2.6.RELEASE | 增加售后阶段 | 海波 | 2020-05-14 |
+        | 1.2.7.RELEASE | 全单退增加是否退配送费 | 海波 | 2020-05-14 |
+        | 1.1.9-SNAPSHOT | 创建订单增加appid字段 | wuping | 2020-05-08 |
+        | 1.2.8.RELEASE | 1.1.9-SNAPSHOT升RELEASE版本 | wuping | 2020-05-18 |
+        | 1.2.9.RELEASE | 规范orderExtInfoDto | 侯书虎 | 2020-05-19 |
+        | 1.3.3-SNAPSHOT | 创建售后单接口增加任务 | wuping | 2020-04-27 |
+        | 1.3.4-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
+        | 1.2.10.RELEASE | 增加售后单任务 | wuping | 2020-05-21 |
+        | 1.2.11.RELEASE | 增加订单支付方式 | 海波 | 2020-05-25 |
+        | 1.3.1.RELEASE | 增加下游订单号 | 海波 | 2020-06-01 |
+        | 1.3.2.RELEASE | 增加非码微店类型 | 梁崇福 | 2020-06-05 |
+        | 1.4.12-SNAPSHOT | 增加新接口：新增结算信息 | wuping | 2020-05-28 |
+        | 1.4.13-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 |
+        | 1.3.3.RELEASE | 买券订单修改升级RELEASE | wuping | 2020-06-10 |
+        | 1.3.13-SNAPSHOT | 预约单任务删除 | wuping | 2020-06-05 |
+        | 1.3.4.RELEASE | 预约单任务删除RELEASE | wuping | 2020-06-15 |
+        | 1.3.5.RELEASE | 围餐 | dingkai | 2020-06-16 |
+        | 1.3.6.RELEASE | 小助手营业额统计 | 梁崇福 | 2020-06-22 |
+        | 1.3.7.RELEASE | 停车场sdk | dingkai | 2020-06-22 |
+        | 1.3.8.RELEASE | 增加小程序场景值 | 李小二 | 2020-07-01 |
+        | 1.3.9.RELEASE | 增加支付渠道编号 | 李小二 | 2020-07-08 |
+        | 1.3.10.RELEASE | OrderExtInfoDto新增parkingAreaName | wuping | 2020-07-13 |
\ No newline at end of file

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java

@@ -179,7 +179,7 @@ public class InterfaceAddressConstant {
     /**
      * 新增结算信息
      */
-    public static final String CREATE_SETTLEMENT="order/v2/createSettlement";
+    public static final String CREATE_SETTLEMENT = "order/v2/createSettlement";
 
     //小助手营业额统计
     public static final String QUERY_ORDER_STATISTICS = "order/v2/queryOrderStatistics";
@@ -188,4 +188,17 @@ public class InterfaceAddressConstant {
      * 停车场订单，根据综合条件查询订单(单次查询默认返回500条（建议pageSize不要大于1000），返回的scrollId 有效时间为120秒)
      */
     public static final String QUERY_PARKING_ORDER_BY_CONDITIONS = "parking/v2/queryOrderByConditions";
+
+
+    /**
+     * 停车场 创建订单
+     */
+    public static final String PARKING_V2_CREATE = "/parking/v2/create";
+
+    /**
+     * /parking/v2/affirm
+     * 完成停车订单
+     */
+    public static final String PARKING_V2_AFFIRM = "/parking/v2/affirm";
+
 }

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

+package com.freemud.application.sdk.api.ordercenter.request.carpark;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 发票VO
+ * @Auther: yong.huang
+ * @Date: 2019/1/28 14:48
+ * @Description:
+ */
+@Data
+public class OrderInvoiceReq   {
+    /**
+     * 订单ID
+     */
+    private Long id;
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 订单编码
+     */
+    private String orderCode;
+
+    /**
+     * 公司编号
+     */
+    private String partnerId;
+
+    /**
+     * 订单商品ID
+     */
+    private String itemId;
+
+    /**
+     * 发票类型 {@link cn.freemud.shared.order.enums.order.OrderInvoiceType#API_DESC}
+     */
+    private Byte invoiceType;
+
+    /**
+     * 发票抬头
+     */
+    private String title;
+
+    /**
+     * 发票内容
+     */
+    private String content;
+
+    /**
+     * 税号
+     */
+    private String taxNo;
+
+    /**
+     * 发票金额 单位分
+     */
+    private BigDecimal amount;
+
+    /**
+     * 发票地址
+     */
+    private String address;
+
+    /**
+     * 电话号码
+     */
+    private String phoneNo;
+
+    /**
+     * 银行账号
+     */
+    private String bankCardNo;
+
+    /**
+     * 开户行
+     */
+    private String invoiceBank;
+
+    /**
+     * 发票URL地址
+     */
+    private String invoiceUrl;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+}

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

+package com.freemud.application.sdk.api.ordercenter.request.carpark;
+
+
+import com.freemud.application.sdk.api.ordercenter.request.create.OrderSettlementCreateReq;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author hongwang
+ */
+@Getter
+@Setter
+@ToString
+public class ParkingOrderAffirmReq {
+
+   /*** "订单号"***/
+    private String orderCode;
+
+   /*** "实际支付现金金额，扣除支付自生优惠，单位分"***/
+    private BigDecimal actualPayAmount;
+
+   /*** "订单结算信息"***/
+    @Valid
+   List<OrderSettlementCreateReq> orderSettlementDetailList = new ArrayList<>();
+
+   /*** "支付方式："+ PayChannelType.API_DESC***/
+    private Byte payChannelType;
+
+   /*** "支付成功时间"***/
+    private Date payTime;
+
+   /*** "支付凭证请求号"***/
+    private String payRequestNo;
+
+   /*** "操作人"***/
+    private String operator;
+
+}

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

+package com.freemud.application.sdk.api.ordercenter.request.carpark;
+
+import com.freemud.application.sdk.api.ordercenter.request.create.OrderSettlementCreateReq;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * 停车场
+ * @author hongwang
+ */
+@Getter
+@Setter
+@ToString
+public class ParkingOrderCreateReq {
+
+    /*** "商户号"***/
+    private String partnerId;
+
+    /*** "门店编号"***/
+    private String storeId;
+
+    /*** "第三方订单号"***/
+    private String thirdOrderCode;
+
+    /*** "停车场ID"***/
+    private String parkingAreaId;
+
+    /*** "停车场名称"***/
+    private String parkingAreaName;
+
+    /*** "用户ID"***/
+    private String userId;
+
+    /*** "用户姓名"***/
+    private String userName;
+
+    /*** "订单金额"***/
+    private BigDecimal originalAmount;
+
+    /*** "实际支付现金金额，扣除支付自生优惠，单位分"***/
+    private BigDecimal actualPayAmount;
+
+    /*** "订单结算信息"***/
+    List<OrderSettlementCreateReq> orderSettlementDetailList = new ArrayList<>();
+
+    /*** "车牌号"***/
+    private String carNumber;
+
+    /*** "入场时间"***/
+    private Date inTime;
+
+    /*** "出场时间"***/
+    private Date outTime;
+
+    /*** "支付方式"***/
+    private Byte PayChannelType;
+
+    /*** "手机号"***/
+    private String mobile;
+
+    /*** "发票明细"***/
+    private OrderInvoiceReq orderInvoice;
+
+    /*** "默认不填=99，"+ OrderBizType.API_DESC***/
+    private Byte bizType;
+
+    /**
+     * 发票图片
+     */
+    private List<String> imgUlr;
+    /**
+     * 门店名称
+     */
+    private String storeName;
+
+    /**
+     * 商户名称
+     */
+    private String partnerName;
+
+   
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/carpark/OrderInvoiceResp.java

+package com.freemud.application.sdk.api.ordercenter.response.carpark;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * All rights Reserved, Designed By www.freemud.com
+ *
+ * @version V1.0
+ * @Description: 一句话描述
+ * @author: hongwang.zhang
+ * @date: 2020-01-07 19:43:40
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目.
+ */
+public class OrderInvoiceResp {
+   /***  "订单ID"***/
+    private Long orderId;
+
+   /***  "商户编号"***/
+    private String partnerId;
+
+   /***  "订单商品ID"***/
+    private String itemId;
+
+   /***  OrderInvoiceType.API_DESC***/
+    private Byte invoiceType;
+
+   /***  "发票抬头"***/
+    private String title;
+
+   /***  "发票内容"***/
+    private String content;
+
+   /***  "税号"***/
+    private String taxNo;
+
+   /***  "发票金额 单位分"***/
+    private BigDecimal amount;
+
+   /***  "发票地址"***/
+    private String address;
+
+   /***  "电话号码"***/
+    private String phoneNo;
+
+   /***  "银行账号"***/
+    private String bankCardNo;
+
+   /***  "开户行"***/
+    private String invoiceBank;
+
+   /***  "发票URL地址"***/
+    private String invoiceUrl;
+
+   /***  "创建时间"***/
+    private Date createTime;
+
+   /***  "更新时间"***/
+    private Date updateTime;
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/carpark/OrderResp.java

+
+
+package com.freemud.application.sdk.api.ordercenter.response.carpark;
+
+import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
+import com.freemud.application.sdk.api.ordercenter.response.carpark.OrderInvoiceResp;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author qi.xu  2018/09/05 10:30
+ */
+@Data
+public class OrderResp {
+    /*** "订单编号"***/
+    private String orderCode;
+
+    /*** "父订单编号"***/
+    private String parentCode;
+
+    /*** "商户号"***/
+    private String partnerId;
+
+    /*** "商户名"***/
+    private String partnerName;
+
+    /*** "门店编号"***/
+    private String storeId;
+
+    /*** "第三方门店编号"***/
+    private String thirdStoreId;
+
+    /*** "门店名"***/
+    private String storeName;
+
+    /*** "门店全局唯一编号"***/
+    private String storeUnifyId;
+
+    /*** "目的门店"***/
+    private String toStoreId;
+
+    /*** "用户ID"***/
+    private String userId;
+
+    /*** "用户姓名"***/
+    private String userName;
+
+    /*** OrderStatus.API_DESC***/
+    private Byte orderState;
+
+    /*** "订单子状态"***/
+    private Integer orderSubState;
+
+    /*** OrderType.API_DESC***/
+    private Byte orderType;
+
+    /*** PayStatus.API_DESC***/
+    private Byte payState;
+
+    /*** PayType.API_DESC***/
+    private Byte payType;
+
+    /*** "当前支付请求号"***/
+    private String payRequestNo;
+
+    /*** "最新的售后单的状态"***/
+    private Byte afterSalesState;
+
+
+    /*** "支付渠道"***/
+    private String payChannel;
+
+    /*** "支付渠道名称"***/
+    private String payChannelName;
+
+    /*** OrderDeliveryStatus.API_DESC***/
+    private Integer deliveryState;
+
+    /*** OrderDispenseStatus.API_DESC***/
+    private Integer dispenseStatus;
+
+    /*** "订单原始金额，单位分"***/
+    private BigDecimal originalAmount;
+
+    /*** "用户在界面上看到的支付金额"***/
+    private BigDecimal settlementAmount;
+
+    /*** "实际支付现金金额，扣除支付自生优惠，单位分"***/
+    private BigDecimal actualPayAmount;
+
+    /*** "是否需要开发票"***/
+    private Boolean needInvoice;
+
+    /*** "是否立即送达"***/
+    private Boolean immediately;
+
+    /*** OrderClientType.API_DESC***/
+    private Byte orderClient;
+
+    /*** "商户自己生成的订单号"***/
+    private String companySelfCode;
+
+    /*** "第三方订单号"***/
+    private String thirdOrderCode;
+
+    /*** "订单备注"***/
+    private String note;
+
+    /*** "取消原因"***/
+    private String cancelReason;
+
+    /*** "取货号 取餐号"***/
+    private String pickUpGoodsNo;
+
+    /*** OrderMarketType.API_DESC***/
+    private Byte marketingType;
+
+    /*** "销售类型对应的场景值"***/
+    private String marketingCode;
+
+    /*** "配送类型 1自配送(三方渠道配送、商家店员配送** 2平台配送"***/
+    private Byte expressType;
+
+    /*** "配送渠道名称"***/
+    private String expressChannelName;
+
+    /*** "配送渠道编号"***/
+    private String expressChannelCode;
+
+    /*** "快递单号"***/
+    private String expressNo;
+
+    /*** "重量"***/
+    private BigDecimal weight;
+
+    /*** "是否能退货 是否有退货商品"***/
+    private Boolean canRefund;
+
+    /*** "支付时间"***/
+    private Date payTime;
+
+    /*** "发货时间"***/
+    private Date deliveryTime;
+
+    /*** "签收时间 送达时间 收货时间"***/
+    private Date receiveTime;
+
+    /*** "打印时间"***/
+    private Date printTime;
+
+    /*** "接单时间"***/
+    private Date acceptTime;
+
+    /*** "实际到达时间"***/
+    private Date actualArrivalTime;
+
+    /*** "捡货时间（制作完成发货的时间）"***/
+    private Date pickUpTime;
+
+    /*** "桌台号"***/
+    private String barCounter;
+
+    /*** "pos编号"***/
+    private String posCode;
+
+    /*** "就餐人数"***/
+    private Integer dinersNumber;
+
+    /*** "小程序本地tableKey"***/
+    private String localTableKey;
+
+    /*** "pos table key"***/
+    private String posTableKey;
+
+    /*** "预约时间"***/
+    private Date expectTime;
+
+    /*** "挂起状态 0 正常 1 未成团挂起 2 风控挂起 3 售后挂起"***/
+    private Byte suspendState;
+
+    /*** "挂起描述"***/
+    private String suspendDesc;
+
+    /*** OrderAbnormalStatus.API_DESC***/
+    private Byte abnormalState;
+
+    /*** "订单异常具体描述"***/
+    private String abnormalDesc;
+
+    /*** "打印次数"***/
+    private Integer printNum;
+
+
+    /*** "创建时间"***/
+    private Date createTime;
+
+    /*** "更新时间"***/
+    private Date updateTime;
+
+    /*** "发票明细"***/
+    private OrderInvoiceResp orderInvoice;
+
+    /*** "扩展字段"***/
+    private String extInfo;
+
+    /*** OrderBizType.API_DESC***/
+    private Byte bizType;
+
+    /*** "下单区域"***/
+    private String orderArea;
+
+    /*** "承诺送达标识  0-无承诺 60-1小时达 120-2小时达 180-3小时达 1440-隔日达"***/
+    private Short deliveryPromise;
+
+    /*** "预计送达时间"***/
+    private Date estimateDeliveryCompleteTime;
+
+    /*** "订单商品信息"***/
+    List<OrderItemResp> orderItemList;
+
+    /*** "订单费用信息"***/
+    List<OrderCostResp> orderCostDetailList;
+
+    /*** "订单结算信息"***/
+    List<OrderSettlementResp> orderSettlementDetailList;
+
+    /*** "配送联系信息"***/
+    List<DeliveryContactInfoResp> deliveryContactInfoList;
+
+    /*** "售后单信息"***/
+    List<AfterSalesOrderResp> afterSalesOrderList;
+
+    /*** "订单操作历史"***/
+    List<OrderOperationHistoryResp> orderOperationHistoryList;
+
+    /*** "订单扩展信息"***/
+    private OrderExtendedReq orderExtended;
+
+    /*** "门店当天订单计数"***/
+    private Integer daySeq;
+
+    /*** "是否为父订单"***/
+    private Boolean isParent;
+
+    /*** "订单来源 "+SourceType.API_DESC***/
+    private Byte sourceType;
+
+    /*** "下单渠道appId"***/
+    private String appId;
+
+    /*** "下游POS商编号"***/
+    private String downstreamPosCode;
+
+    /*** "下游订单号"***/
+    private String downstreamThirdOrderCode;
+
+    /*** "订单支付渠道类型" +PayChannelType.API_DESC***/
+    private Byte payChannelType;
+}