Commit 632e2754 by 周晓航

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

parents b50255ef d99ca828
...@@ -132,7 +132,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -132,7 +132,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
@Value("${avoid.version.upgrade.config:}") @Value("${avoid.version.upgrade.config:}")
private String avoidVersionUpgradeConfig; private String avoidVersionUpgradeConfig;
@Value("${version.upgrade.weekDay:null}") @Value("${version.upgrade.weekDay:}")
private List<Integer> weekDay; private List<Integer> weekDay;
@Override @Override
...@@ -675,7 +675,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -675,7 +675,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
cal.setTime(datet); cal.setTime(datet);
int w = cal.get(Calendar.DAY_OF_WEEK) - 1; int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
// 增加一个发版开关 // 增加一个发版开关
if (CollectionUtils.isNotEmpty(weekDay)) { if (CollectionUtils.isNotEmpty(weekDay) && weekDay.size()>0) {
if (weekDay.contains(w)) { if (weekDay.contains(w)) {
// 校验时间 是否是 23:00 之后 // 校验时间 是否是 23:00 之后
int hourOfDay = cal.get(Calendar.HOUR_OF_DAY); int hourOfDay = cal.get(Calendar.HOUR_OF_DAY);
......
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