Commit 9ab8897b by zhiheng.zhang

配送费回退

parent ef09fdf9
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>2.1.57-RELEASE</version> <version>2.1.58-RELEASE</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
...@@ -131,4 +131,5 @@ ...@@ -131,4 +131,5 @@
| 2.1.54-RELEASE | 基础订单sdk qa/预发布、生产/环境使用LoadBalanced | wuping | 2021-04-26| | 2.1.54-RELEASE | 基础订单sdk qa/预发布、生产/环境使用LoadBalanced | wuping | 2021-04-26|
| 2.1.55-RELEASE | 统一升级华莱士微商城SDK | 王航航 | 2021-05-10| | 2.1.55-RELEASE | 统一升级华莱士微商城SDK | 王航航 | 2021-05-10|
| 2.1.56-RELEASE | 统一升级华莱士微商城SDK | 张志恒 | 2021-05-11| | 2.1.56-RELEASE | 统一升级华莱士微商城SDK | 张志恒 | 2021-05-11|
| 2.1.57-RELEASE | 统一升级华莱士微商城SDK | 张志恒 | 2021-05-11| | 2.1.57-RELEASE | 统一升级华莱士微商城SDK | 张志恒 | 2021-05-11|
\ No newline at end of file | 2.1.58-RELEASE | 统一升级华莱士微商城SDK | 张志恒 | 2021-05-11|
\ No newline at end of file
...@@ -1083,8 +1083,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -1083,8 +1083,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
orderTask.setTaskType(5); orderTask.setTaskType(5);
orderTask.setTimeout(1); orderTask.setTimeout(1);
//1000*60*60*24*15 毫秒(15天) //1000*60*60*24*15 毫秒(15天)
// long timeout = 1296000000; long timeout = 1296000000;
long timeout = 3600000; // long timeout = 3600000;
long timeMillis = System.currentTimeMillis(); long timeMillis = System.currentTimeMillis();
Date processingDate = new Date(timeMillis + timeout - 60000); Date processingDate = new Date(timeMillis + timeout - 60000);
Date taskTime = new Date(timeMillis + timeout); Date taskTime = new Date(timeMillis + timeout);
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>2.1.57-RELEASE</version> <version>2.1.58-RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>2.1.57-RELEASE</version> <version>2.1.58-RELEASE</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
......
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