Merge remote-tracking branch 'remotes/origin/feature/20201022-refundReform-刘鹏飞' into master

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.0.15-RELEASE</version>
+    <version>2.0.16-RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>storecenter-sdk</artifactId>
-            <version>2.8.RELEASE</version>
+            <version>3.1.9.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -533,30 +533,53 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 && !ObjectUtils.equals("0", configuration.getAutoChargebackOrderTime())) {
             request.setTimeOut(AutoOrderConfigTime.getTime(configuration.getAutoChargebackOrderTime()));
         }
-        OrderTaskReq orderTask = setAfterSalesOrderTimeOutTask();
+        OrderTaskReq orderTask = setAfterSalesOrderTimeOutTask(configuration);
         request.setOrderTask(orderTask);
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.createAfterSalesOrder(request, orderRefundRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }
 
     /**
-     * 设置申请退款48小时后回调任务
+     * 设置申请退款时间
+     * 如果时间的类型是2表示采用原来的48小时逻辑
+     * 如果时间的类型是1表示在指定的时间之后进行退款
+     * 为了防止同一时刻的退款量太大，需要将退款的订单分散到指定的时间后半小时内
      */
-    private OrderTaskReq setAfterSalesOrderTimeOutTask() {
-        OrderTaskReq orderTask = new OrderTaskReq();
-        orderTask.setTaskType(4);
-        orderTask.setTimeout(1);
-        //1000*60*60*24*2 毫秒（48小时）
-        long timeout = 172800000;
-        long timeMillis = System.currentTimeMillis();
-        Date processingDate = new Date(timeMillis + timeout - 60000);
-        Date taskTime = new Date(timeMillis + timeout);
-        orderTask.setTaskTime(DateUtil.convert2String(taskTime, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
-        //处理时间，当前时间加48小时减1分钟
-        orderTask.setProcessingTime(DateUtil.convert2String(processingDate, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
-
-        return orderTask;
-//        request.setOrderTask(orderTask);
+    private OrderTaskReq setAfterSalesOrderTimeOutTask(StoreResponse.Configuration configuration) {
+
+        if(configuration != null && (configuration.getTimeTypeOfRefund() != null && 2 == configuration.getTimeTypeOfRefund().intValue()) || configuration.getTimeTypeOfRefund() == null){// 48小时之后
+            OrderTaskReq orderTask = new OrderTaskReq();
+            orderTask.setTaskType(4);
+            orderTask.setTimeout(1);
+            //1000*60*60*24*2 毫秒（48小时）
+            long timeout = 172800000;
+            long timeMillis = System.currentTimeMillis();
+            Date processingDate = new Date(timeMillis + timeout - 60000);
+            Date taskTime = new Date(timeMillis + timeout);
+            orderTask.setTaskTime(DateUtil.convert2String(taskTime, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+            //处理时间，当前时间加48小时减1分钟
+            orderTask.setProcessingTime(DateUtil.convert2String(processingDate, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+
+            return orderTask;
+        }else if(configuration != null && configuration.getTimeTypeOfRefund() != null && 1 == configuration.getTimeTypeOfRefund().intValue()){// 指定时间
+            OrderTaskReq orderTask = new OrderTaskReq();
+            orderTask.setTaskType(4);
+            orderTask.setTimeout(1);
+            // 获取门店配置的当天指定的退款时间
+            String timeOfRefund = configuration.getTimeOfRefund();
+            // 获取半小时的随机数
+            Random r = new Random();
+            int minute = r.ints(1,31).findFirst().getAsInt() * 60000;
+            String today = DateUtil.getCurrentDate(DateUtil.FORMAT_YMD);
+            Date configTime = DateUtil.convert2Date(today+" "+timeOfRefund, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
+            Date processingDate = new Date(configTime.getTime() + minute);
+            String processingStr = DateUtil.convert2String(processingDate, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
+            orderTask.setTaskTime(processingStr);
+            orderTask.setProcessingTime(processingStr);
+
+            return orderTask;
+        }
+        return null;
     }
 
     /**
@@ -679,7 +702,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                     && !ObjectUtils.equals("0", configuration.getAutoChargebackOrderTime())) {
                 request.setTimeOut(AutoOrderConfigTime.getTime(configuration.getAutoChargebackOrderTime()));
             }
-            OrderTaskReq orderTask = setAfterSalesOrderTimeOutTask();
+            OrderTaskReq orderTask = setAfterSalesOrderTimeOutTask(configuration);
             request.setOrderTask(orderTask);
         }
         request.setRefundDeliveryAmount(cancelOrderRequest.isRefundDeliveryAmount());

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.15-RELEASE</version>
+            <version>2.0.16-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>storecenter-sdk</artifactId>
-            <version>3.2.1-SNAPSHOT</version>
+            <version>3.1.9.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>