Merge branch 'KA-20210702-非码发版日售后单时间推迟-周晓航' into qa

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

@@ -132,6 +132,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     @Value("${avoid.version.upgrade.config:}")
     private String avoidVersionUpgradeConfig;
 
+    @Value("${version.upgrade.weekDay:}")
+    private List<Integer> weekDay;
 
     @Override
     public CreateOrderResponse createOrderFlow(CreateOrderRequest config) {
@@ -672,14 +674,25 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         }
         cal.setTime(datet);
         int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
-        if (CommonConstant.weekDay.contains(w)) {
-            // 校验时间 是否是 23:00 之后
-            int hourOfDay = cal.get(Calendar.HOUR_OF_DAY);
-            if (hourOfDay >= 23){
-                // 表示 设置时间为23点之后
-               return true;
+        // 增加一个发版开关
+        if (CollectionUtils.isNotEmpty(weekDay)) {
+            if (weekDay.contains(w)) {
+                // 校验时间 是否是 23:00 之后
+                int hourOfDay = cal.get(Calendar.HOUR_OF_DAY);
+                if (hourOfDay >= 23){
+                    // 表示 设置时间为23点之后
+                    return true;
+                }
+            }
+        }else {
+            if (CommonConstant.weekDay.contains(w)) {
+                // 校验时间 是否是 23:00 之后
+                int hourOfDay = cal.get(Calendar.HOUR_OF_DAY);
+                if (hourOfDay >= 23){
+                    // 表示 设置时间为23点之后
+                   return true;
+                }
             }
-
         }
         return false;
     }