Skip to content

O
order-group
Commit e76791a7 by ping.wu
Options

Merge branches 'feature/20200619_停车场订单sdk_wuping' and 'master' of… 

Merge branches 'feature/20200619_停车场订单sdk_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
parents fbf29115 e4f0b803
Showing with 113 additions and 38 deletions
ordercenter-sdk/readme.md
...@@ -13,33 +13,34 @@ ...@@ -13,33 +13,34 @@
| 1.1.7-SNAPSHOT | 预约单支付成功接口增加预约任务 | wuping | 2020-03-10 | | 1.1.7-SNAPSHOT | 预约单支付成功接口增加预约任务 | wuping | 2020-03-10 |
| 1.1.8-SNAPSHOT | 预约单接单接口增加预约任务 | wuping | 2020-03-17 | | 1.1.8-SNAPSHOT | 预约单接单接口增加预约任务 | wuping | 2020-03-17 |
| 1.1.8.RELEASE | 预约单升级RELEASE | wuping | 2020-03-18 | | 1.1.8.RELEASE | 预约单升级RELEASE | wuping | 2020-03-18 |
| 1.1.9.RELEASE | 满额减配送费RELEASE | dingkai | 2020-03-26 | | 1.1.9.RELEASE | 满额减配送费RELEASE | dingkai | 2020-03-26 |
| 1.2.0.RELEASE | 新增订单商品汇总下载接口 | 侯书虎 | 2020-04-07 | | 1.2.0.RELEASE | 新增订单商品汇总下载接口 | 侯书虎 | 2020-04-07 |
| 1.2.1.RELEASE | oms接单 | 侯书虎 | 2020-04-13 | | 1.2.1.RELEASE | oms接单 | 侯书虎 | 2020-04-13 |
| 1.2.2.RELEASE | 新增真实配送费 | 海波 | 2020-04-27 | | 1.2.2.RELEASE | 新增真实配送费 | 海波 | 2020-04-27 |
| 1.2.2.RELEASE | ES查询增加异常单状态 | 李小二 | 2020-04-27 | | 1.2.2.RELEASE | ES查询增加异常单状态 | 李小二 | 2020-04-27 |
| 1.2.3.RELEASE | 配送费实际金额 | 胡超 | 2020-05-11 | | 1.2.3.RELEASE | 配送费实际金额 | 胡超 | 2020-05-11 |
| 1.2.4.RELEASE | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-11 | | 1.2.4.RELEASE | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-11 |
| 1.2.5.RELEASE | 取消接口新增超时时间字段 | wuping | 2020-05-12 | | 1.2.5.RELEASE | 取消接口新增超时时间字段 | wuping | 2020-05-12 |
| 1.2.6.RELEASE | 增加售后阶段 | 海波 | 2020-05-14 | | 1.2.6.RELEASE | 增加售后阶段 | 海波 | 2020-05-14 |
| 1.2.7.RELEASE | 全单退增加是否退配送费 | 海波 | 2020-05-14 | | 1.2.7.RELEASE | 全单退增加是否退配送费 | 海波 | 2020-05-14 |
| 1.1.9-SNAPSHOT | 创建订单增加appid字段 | wuping | 2020-05-08 | | 1.1.9-SNAPSHOT | 创建订单增加appid字段 | wuping | 2020-05-08 |
| 1.2.8.RELEASE | 1.1.9-SNAPSHOT升RELEASE版本 | wuping | 2020-05-18 | | 1.2.8.RELEASE | 1.1.9-SNAPSHOT升RELEASE版本 | wuping | 2020-05-18 |
| 1.2.9.RELEASE | 规范orderExtInfoDto | 侯书虎 | 2020-05-19 | | 1.2.9.RELEASE | 规范orderExtInfoDto | 侯书虎 | 2020-05-19 |
| 1.3.3-SNAPSHOT | 创建售后单接口增加任务 | wuping | 2020-04-27 | | 1.3.3-SNAPSHOT | 创建售后单接口增加任务 | wuping | 2020-04-27 |
| 1.3.4-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 | | 1.3.4-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
| 1.2.10.RELEASE | 增加售后单任务 | wuping | 2020-05-21 | | 1.2.10.RELEASE | 增加售后单任务 | wuping | 2020-05-21 |
| 1.2.11.RELEASE | 增加订单支付方式 | 海波 | 2020-05-25 | | 1.2.11.RELEASE | 增加订单支付方式 | 海波 | 2020-05-25 |
| 1.3.1.RELEASE | 增加下游订单号 | 海波 | 2020-06-01 | | 1.3.1.RELEASE | 增加下游订单号 | 海波 | 2020-06-01 |
| 1.3.2.RELEASE | 增加非码微店类型 | 梁崇福 | 2020-06-05 | | 1.3.2.RELEASE | 增加非码微店类型 | 梁崇福 | 2020-06-05 |
| 1.4.12-SNAPSHOT | 增加新接口：新增结算信息 | wuping | 2020-05-28 | | 1.4.12-SNAPSHOT | 增加新接口：新增结算信息 | wuping | 2020-05-28 |
| 1.4.13-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 | | 1.4.13-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 |
| 1.3.3.RELEASE | 买券订单修改升级RELEASE | wuping | 2020-06-10 | | 1.3.3.RELEASE | 买券订单修改升级RELEASE | wuping | 2020-06-10 |
| 1.3.13-SNAPSHOT | 预约单任务删除 | wuping | 2020-06-05 | | 1.3.13-SNAPSHOT | 预约单任务删除 | wuping | 2020-06-05 |
| 1.3.4.RELEASE | 预约单任务删除RELEASE | wuping | 2020-06-15 | | 1.3.4.RELEASE | 预约单任务删除RELEASE | wuping | 2020-06-15 |
| 1.3.5.RELEASE | 围餐 | dingkai | 2020-06-16 | | 1.3.5.RELEASE | 围餐 | dingkai | 2020-06-16 |
| 1.3.6.RELEASE | 小助手营业额统计 | 梁崇福 | 2020-06-22 | | 1.3.6.RELEASE | 小助手营业额统计 | 梁崇福 | 2020-06-22 |
| 1.3.7.RELEASE | 停车场sdk | dingkai | 2020-06-22 | | 1.3.7.RELEASE | 停车场sdk | dingkai | 2020-06-22 |
| 1.3.8.RELEASE | 增加小程序场景值 | 李小二 | 2020-07-01 | | 1.3.8.RELEASE | 增加小程序场景值 | 李小二 | 2020-07-01 |
| 1.3.9.RELEASE | 增加支付渠道编号 | 李小二 | 2020-07-08 | | 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.3.14-SNAPSHOT | es综合查询新增appId查询条件 | wuping | 2020-06-30 |
\ 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 { ...@@ -108,14 +108,13 @@ public class InterfaceAddressConstant {
*/ */
public static final String QUERY_RELATED_ORDER_BY_CODE = "order/v2/queryRelatedOrderByCode"; 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_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 { ...@@ -150,7 +149,7 @@ public class InterfaceAddressConstant {
*/ */
public static final String QUERY_ORDER_AFTER_SALE_DOWN = "order/v2/queryAfterSalesOrderByScrollId"; 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"; public static final String QUERY_AFT_SALE_ORDER_LIST = "order/v2/queryAfterSalesOrderConditions";
/** /**
...@@ -161,14 +160,14 @@ public class InterfaceAddressConstant { ...@@ -161,14 +160,14 @@ public class InterfaceAddressConstant {
/** /**
* 根据用户ID 查询30分钟内未支付并且有券的 订单 * 根据用户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"; public static final String UPDATE_DOWNSTREAM_THIRD_ORDER_CODE = "order/v2/updateDownstreamOrderCode";
...@@ -184,4 +183,9 @@ public class InterfaceAddressConstant { ...@@ -184,4 +183,9 @@ public class InterfaceAddressConstant {
//小助手营业额统计 //小助手营业额统计
public static final String QUERY_ORDER_STATISTICS = "order/v2/queryOrderStatistics"; public static final String QUERY_ORDER_STATISTICS = "order/v2/queryOrderStatistics";
/**
* 停车场订单，根据综合条件查询订单(单次查询默认返回500条（建议pageSize不要大于1000），返回的scrollId 有效时间为120秒)
*/
public static final String QUERY_PARKING_ORDER_BY_CONDITIONS = "parking/v2/queryOrderByConditions";
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderConditionsReq.java
...@@ -115,5 +115,7 @@ public class OrderConditionsReq { ...@@ -115,5 +115,7 @@ public class OrderConditionsReq {
//异常单状态 //异常单状态
private List<Integer> abnormalStatuses; private List<Integer> abnormalStatuses;
//应用ID
private String appId;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
...@@ -148,4 +148,9 @@ public class OrderExtInfoDto { ...@@ -148,4 +148,9 @@ public class OrderExtInfoDto {
* 支付渠道编号(参考支付组payment_platform) * 支付渠道编号(参考支付组payment_platform)
*/ */
private String payCode; private String payCode;
/**
* 停车场订单手机号
*/
private String mobile;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/ParkingOrderConditionsReq.java 0 → 100644
package com.freemud.application.sdk.api.ordercenter.request;
import lombok.Data;
import java.util.List;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: ParkingOrderConditionsReq
* @Package com.freemud.application.sdk.api.ordercenter.request
* @Description:
* @author: ping1.wu
* @date: 2020/6/19 18:45
* @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Data
public class ParkingOrderConditionsReq {
//订单号
private String orderCode;
//商户号
private String partnerId;
// 车牌号
private String carNumber;
//手机号
private String mobile;
//订单创建开始时间戳（单位：秒）
private Long startTimestamp;
//订单创建结束时间戳（单位：秒）
private Long endTimestamp;
//每页页数
private Integer pageSize;
//页码
private Integer pageNum;
private List<Integer> payStatuses;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderDownLoadSdkService.java
...@@ -6,6 +6,7 @@ import com.freemud.application.sdk.api.ordercenter.config.OrderDownLoadCenterPro ...@@ -6,6 +6,7 @@ import com.freemud.application.sdk.api.ordercenter.config.OrderDownLoadCenterPro
import com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant; import com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant;
import com.freemud.application.sdk.api.ordercenter.enums.ResponseResultEnum; import com.freemud.application.sdk.api.ordercenter.enums.ResponseResultEnum;
import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq; import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
import com.freemud.application.sdk.api.ordercenter.request.ParkingOrderConditionsReq;
import com.freemud.application.sdk.api.ordercenter.request.QueryAfterSalesOrderConditionsReq; import com.freemud.application.sdk.api.ordercenter.request.QueryAfterSalesOrderConditionsReq;
import com.freemud.application.sdk.api.ordercenter.request.QueryOrderByScrollRequest; import com.freemud.application.sdk.api.ordercenter.request.QueryOrderByScrollRequest;
import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse; import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
...@@ -125,6 +126,20 @@ public class OrderDownLoadSdkService { ...@@ -125,6 +126,20 @@ public class OrderDownLoadSdkService {
return queryResponse; return queryResponse;
} }
/**
* es查询停车场订单
*/
public BaseDownLoadResponse<List<OrderInfoReqs>> queryParkingOrderConditions(ParkingOrderConditionsReq request, String trackingNo) {
long begin = System.currentTimeMillis();
BaseDownLoadResponse<List<OrderInfoReqs>> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexDownLoad(restTemplate, InterfaceAddressConstant.QUERY_PARKING_ORDER_BY_CONDITIONS,
createBaseRequest(request, trackingNo), new ParameterizedTypeReference<BaseDownLoadResponse<List<OrderInfoReqs>>>() {
});
ThirdPartyLog.infoConvertJson(begin, System.currentTimeMillis(), InterfaceAddressConstant.QUERY_PARKING_ORDER_BY_CONDITIONS, request, responseMini(responseDTO));
return responseHandle(responseDTO);
}
BaseDownLoadResponse responseMini(BaseDownLoadResponse responseDTO){ BaseDownLoadResponse responseMini(BaseDownLoadResponse responseDTO){
BaseDownLoadResponse baseDownLoadResponse = new BaseDownLoadResponse(); BaseDownLoadResponse baseDownLoadResponse = new BaseDownLoadResponse();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment