1、增加手动录单

2、手动录单订单完成接口

ordercenter-sdk/pom.xml

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

ordercenter-sdk/readme.md

@@ -42,4 +42,5 @@
         | 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 |
+        | 1.3.10.RELEASE | OrderExtInfoDto新增parkingAreaName | wuping | 2020-07-13 |
\ No newline at end of file
+        |1.4.31-SNAPSHOT | 增加手动录单，和完成订单接口 |张虹旺| 2020-07-18
\ No newline at end of file

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

@@ -108,14 +108,13 @@ public class InterfaceAddressConstant {
      */
     public static final String QUERY_RELATED_ORDER_BY_CODE = "order/v2/queryRelatedOrderByCode";
     /**
-     *
-     修改订单编号
+     * 修改订单编号
      */
     public static final String UPDATE_THIRD_ORDER_CODE = "order/v2/updateThirdOrderCode";
     /**
      * 更新订单异常信息
      */
-    public static final String UPDATE_ABNORMAL_STATE="order/v2/updateAbnormalState";
+    public static final String UPDATE_ABNORMAL_STATE = "order/v2/updateAbnormalState";
 
     /**
      * 订单完成接口(围餐)
@@ -150,7 +149,7 @@ public class InterfaceAddressConstant {
      */
     public static final String QUERY_ORDER_AFTER_SALE_DOWN = "order/v2/queryAfterSalesOrderByScrollId";
     /**
-     *根据综合条件查询售后单(单次查询默认返回500条（建议pageSize不要大于1000），返回的scrollId 有效时间为120秒)
+     * 根据综合条件查询售后单(单次查询默认返回500条（建议pageSize不要大于1000），返回的scrollId 有效时间为120秒)
      */
     public static final String QUERY_AFT_SALE_ORDER_LIST = "order/v2/queryAfterSalesOrderConditions";
     /**
@@ -161,14 +160,14 @@ public class InterfaceAddressConstant {
     /**
      * 根据用户ID 查询30分钟内未支付并且有券的 订单
      */
-    public static final String QUERY_ORDER_WITH_COUPON="order/v2/queryOrderWithCoupon";
+    public static final String QUERY_ORDER_WITH_COUPON = "order/v2/queryOrderWithCoupon";
     /**
      * 订单管理
      */
-    public static final String STATUS_OPERATE="order/statusOperate";
+    public static final String STATUS_OPERATE = "order/statusOperate";
 
     /**
-     *修改下游POS商订单数据
+     * 修改下游POS商订单数据
      */
     public static final String UPDATE_DOWNSTREAM_THIRD_ORDER_CODE = "order/v2/updateDownstreamOrderCode";
 
@@ -180,8 +179,21 @@ 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";
+
+
+    /**
+     * 停车场 创建订单
+     */
+    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;
+
+   
+}

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;
+}