Skip to content

O
order-group
Commit a4cbcaf1 by shuhu.hou
Options

Merge branch 'feature/20200319_队列缓存自动过期' into develop 

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/readme.md
parents 2d2bed7c 43dea5db
Showing with 18 additions and 42 deletions
assortment-ordercenter-sdk/readme.md
...@@ -2,40 +2,19 @@ ...@@ -2,40 +2,19 @@
| 版本号 | 版本说明 | 更新人 | 更新时间 | | 版本号 | 版本说明 | 更新人 | 更新时间 |
| --------------| ------------ | ------------- | ---------- | | --------------| ------------ | ------------- | ---------- |
| 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 | | 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 |
| 1.0.1-SNAPSHOT | 围餐商品数量修改 | 丁凯 | 2019-12-19 | | 6.4.10.RELEASE| 骑手小费 | 张明警 | 2019-12-26 |
| 1.0.3-SNAPSHOT | 创建订单接口新增thirdCategoryId字段 | 侯书虎 | 2019-12-24 |
| 1.0.4-SNAPSHOT | 订单日结售后单 | 胡超 | 2019-12-25 |
| 1.0.5-SNAPSHOT | 综合订单查询新增bizType字段 | 侯书虎 | 2019-12-25 |
| 1.0.7-SNAPSHOT | 综合订单查询新增bizType字段 | 侯书虎 | 2019-12-25 |
| 1.0.8-SNAPSHOT | 骑手小费字段 | 张明警 | 2019-12-26 |
| 1.1.0.RELEASE| 1.9.8需求打包release版本 | 侯书虎 | 2019-12-26 | | 1.1.0.RELEASE| 1.9.8需求打包release版本 | 侯书虎 | 2019-12-26 |
| 1.1.1-SNAPSHOT | 创建订单新增部分参数 | 侯书虎 | 2019-12-27 |
| 1.1.2-SNAPSHOT | 创建订单新增部分参数 | 侯书虎 | 2020-01-03 |
| 1.1.3-SNAPSHOT | 围餐商品删除 | 丁凯 | 2020-01-07 |
| 1.1.1.RELEASE| 1.9.9sessionKey | 胡超 | 20200108 | | 1.1.1.RELEASE| 1.9.9sessionKey | 胡超 | 20200108 |
| 1.1.2.RELEASE| 1.9.9需求打包release版本 | 丁凯 | 20200108 | | 1.1.2.RELEASE| 1.9.9需求打包release版本 | 丁凯 | 20200108 |
| 1.1.3.RELEASE| 1.9.10需求打包release版本（thirdCateId） | 胡超 | 20200113 | | 1.1.3.RELEASE| 1.9.10需求打包release版本（thirdCateId） | 胡超 | 20200113 |
| 1.1.4-SNAPSHOT | 订单渠道新增支付宝 | 侯书虎 | 2020-01-09 |
| 1.1.5-SNAPSHOT | 创建订单新增第三方品类id字段 | 侯书虎 | 2020-01-13 |
| 1.1.4.RELEASE| 农工商submit接口 | 侯书虎 | 2020-01-13 | | 1.1.4.RELEASE| 农工商submit接口 | 侯书虎 | 2020-01-13 |
| 1.1.5.RELEASE| 农工商submit接口(del thirdCateId) | 胡超 | 2020-01-13 | | 1.1.5.RELEASE| 农工商submit接口(del thirdCateId) | 胡超 | 2020-01-13 |
| 1.1.6-SNAPSHOT | 添加性别字段 | 张明警 | 2020-01-18 |
| 1.1.7-SNAPSHOT| 1.9.11商品组 | 胡超 | 2020-02-05 |
| 1.1.8-SNAPSHOT| 核销流程更改 | 侯书虎 | 2020-02-10 |
| 1.1.9-SNAPSHOT| pos渠道名称 | 丁凯 | 2020-02-11 |
| 1.2.0-SNAPSHOT| 订单查询返回orderType字段 | 侯书虎 | 2020-02-12 |
| 1.2.1-SNAPSHOT| 开放平台创建订单修改 | 姜海波 | 2020-02-17 |
| 1.2.2-SNAPSHOT| 开放平台创建订单修改 | 姜海波 | 2020-02-21 |
| 1.2.3-SNAPSHOT| 重量计算 | 丁凯 | 2020-02-26 |
| 1.1.6-SNAPSHOT| 1.9.11商品组 | 胡超 | 2020-02-05 | | 1.1.6-SNAPSHOT| 1.9.11商品组 | 胡超 | 2020-02-05 |
| 1.1.7.RELEASE| 1.9.11商品组 | 胡超 | 2020-02-13 | | 1.1.7.RELEASE| 1.9.11商品组 | 胡超 | 2020-02-13 |
| 1.1.9.RELEASE| pos渠道 | 丁凯 | 2020-02-22 | | 1.1.9.RELEASE| pos渠道 | 丁凯 | 2020-02-22 |
| 1.2.0.RELEASE| 开放平台创建订单 | 姜海波 | 2020-02-24 | | 1.2.0.RELEASE| 开放平台创建订单 | 姜海波 | 2020-02-24 |
| 1.2.1.RELEASE| 基于1.2.0.RELEASE | 丁凯 | 2020-03-04 | | 1.2.1.RELEASE| 基于1.2.0.RELEASE | 丁凯 | 2020-03-04 |
| 1.2.2.RELEASE| 升级RELEASE | wuping | 2020-03-04 | | 1.2.2.RELEASE| 升级RELEASE | wuping | 2020-03-04 |
| 1.2.4-SNAPSHOT| 满额减配送费 | 海波 | 2020-03-09 | | 1.1.7-SNAPSHOT| 预约单支付成功接口增加预约任务 | wuping | 2020-03-10 |
| 1.2.5-SNAPSHOT| 满额减配送费 | 丁凯 | 2020-03-10 | | 1.1.8-SNAPSHOT| 预约单接单接口增加预约任务 | wuping | 2020-03-17 |
| 1.2.6-SNAPSHOT| 预约单支付成功接口增加预约任务 | wuping | 2020-03-10 | | 1.2.3.RELEASE | 预约单升级RELEASE | wuping | 2020-03-18 |
| 1.2.7-SNAPSHOT| 预约单支付成功接口增加预约任务 | wuping | 2020-03-10 | \ No newline at end of file
| 1.2.8-SNAPSHOT| 预约单接单接口增加预约任务 | wuping | 2020-03-17 |
| 1.2.9-SNAPSHOT| 紧急 骑手电话 | 海波 | 2020-03-19 |
\ No newline at end of file
call-back-service/pom.xml
...@@ -71,12 +71,12 @@ ...@@ -71,12 +71,12 @@
<dependency> <dependency>
<groupId>com.freemud.sdk.api.assortment</groupId> <groupId>com.freemud.sdk.api.assortment</groupId>
<artifactId>assortment-orderdistributor-sdk</artifactId> <artifactId>assortment-orderdistributor-sdk</artifactId>
<version>2.5.RELEASE</version> <version>2.6.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.sdk.api.assortment</groupId> <groupId>com.freemud.sdk.api.assortment</groupId>
<artifactId>assortment-data-manager</artifactId> <artifactId>assortment-data-manager</artifactId>
<version>4.2.8.RELEASE</version> <version>4.3.7.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.sdk.api.assortment</groupId> <groupId>com.freemud.sdk.api.assortment</groupId>
......
order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
...@@ -89,7 +89,10 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -89,7 +89,10 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
requestDto.setExpressChannelName(request.getChannelName()); requestDto.setExpressChannelName(request.getChannelName());
requestDto.setExpressNo(request.getChannelDeliveryId()); requestDto.setExpressNo(request.getChannelDeliveryId());
requestDto.setOrderSubState(deliveryStatus); requestDto.setOrderSubState(deliveryStatus);
if (StringUtils.isNotBlank(request.getRemark()))
{
requestDto.setRemark("配送:"+request.getRemark()); requestDto.setRemark("配送:"+request.getRemark());
}
OrderBaseResponse orderBaseResponseDto = orderCenterSdkService.updateDeliveryInfoById(requestDto); OrderBaseResponse orderBaseResponseDto = orderCenterSdkService.updateDeliveryInfoById(requestDto);
//订单服务修改配送单信息失败 //订单服务修改配送单信息失败
if (!SUCCESS_RESPONSE_CODE.equals(orderBaseResponseDto.getErrcode())) { if (!SUCCESS_RESPONSE_CODE.equals(orderBaseResponseDto.getErrcode())) {
......
order-management/pom.xml
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>1.2.2.RELEASE</version> <version>1.2.3.RELEASE</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
......
ordercenter-sdk/pom.xml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>1.1.8-SNAPSHOT</version> <version>1.1.8.RELEASE</version>
<artifactId>ordercenter-sdk</artifactId> <artifactId>ordercenter-sdk</artifactId>
<dependencies> <dependencies>
......
ordercenter-sdk/readme.md
...@@ -2,20 +2,14 @@ ...@@ -2,20 +2,14 @@
| 版本号 | 版本说明 | 更新人 | 更新时间 | | 版本号 | 版本说明 | 更新人 | 更新时间 |
| ------------ | ---------------- | ------ | ---------- | | ------------ | ---------------- | ------ | ---------- |
| 1.0.0-SNAPSHOT | 订单接口初次封装 | wuping | 2019-04-03 | | 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 |
| 1.0.2-SNAPSHOT | 创建订单接口新增thirdCategoryId字段 | 侯书虎 | 2019-12-23 |
| 1.0.3-SNAPSHOT | 订单日结售后单 | 胡超 | 2019-12-25 |
| 1.1.0.RELEASE| 1.9.8需求打包release版本 | 侯书虎 | 2019-12-26 | | 1.1.0.RELEASE| 1.9.8需求打包release版本 | 侯书虎 | 2019-12-26 |
| 1.1.1-SNAPSHOT | 创建订单新增部分参数 | 侯书虎 | 2019-12-27 |
| 1.1.2-SNAPSHOT | 创建订单新增部分参数 | 侯书虎 | 2020-01-03 |
| 1.1.1.RELEASE| 1.9.9需求打包release版本 | 丁凯 | 2020-01-08 | | 1.1.1.RELEASE| 1.9.9需求打包release版本 | 丁凯 | 2020-01-08 |
| 1.1.2.RELEASE| 农工商订单submit | 侯书虎 | 2020-01-13 | | 1.1.2.RELEASE| 农工商订单submit | 侯书虎 | 2020-01-13 |
| 1.1.4-SNAPSHOT| 开放平台专用创建订单接口 | 姜海波 | 2020-02-17 |
| 1.1.5-SNAPSHOT | 优化活动订单 | 胡超 | 2020-02-10 |
| 1.1.3.RELEASE| 开放平台创建订单 | 姜海波 | 2020-02-24 | | 1.1.3.RELEASE| 开放平台创建订单 | 姜海波 | 2020-02-24 |
| 1.1.4-SNAPSHOT | 优化活动订单 | 胡超 | 2020-02-10 |
| 1.1.6-SNAPSHOT | OrderExtInfo新增formId | wuping | 2020-02-27 | | 1.1.6-SNAPSHOT | OrderExtInfo新增formId | wuping | 2020-02-27 |
| 1.1.7-SNAPSHOT | 满额减配送费 | 丁凯 | 2020-03-10 |
| 1.1.8-SNAPSHOT | 预约单支付成功接口增加预约任务 | wuping | 2020-03-10 |
| 1.1.6.RELEASE | 升级RELEASE | wuping | 2020-03-04 | | 1.1.6.RELEASE | 升级RELEASE | wuping | 2020-03-04 |
| 1.1.9-SNAPSHOT | 预约单支付成功接口增加预约任务 | wuping | 2020-03-10 | | 1.1.7-SNAPSHOT | 预约单支付成功接口增加预约任务 | wuping | 2020-03-10 |
| 1.2.0-SNAPSHOT | 预约单接单接口增加预约任务 | wuping | 2020-03-17 | | 1.1.8-SNAPSHOT | 预约单接单接口增加预约任务 | wuping | 2020-03-17 |
\ No newline at end of file | 1.1.8.RELEASE | 预约单升级RELEASE | wuping | 2020-03-18 |
\ No newline at end of file
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