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

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

@@ -80,6 +80,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Import;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -571,7 +572,13 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             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);
+            // 判断当前时间是否已经超过门店设置的截至时间
+            if(new Date().after(configTime)){
+                today = DateUtil.convert2String(DateUtil.addDays(new Date(),1),DateUtil.FORMAT_YMD);
+                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);