demand: oms\小程序-订单录入支持录入企业名称、企业税号 oms\小程序-查询订单详情支持查询企业名称、企业税号 oms\小程序-查询客户地址支持查询企业名称、企业税号 oms\小程序-新增/修改客户地址支持新增/修改企业名称、企业税号
committer: heyu
This commit is contained in:
parent
b6eb0258af
commit
d6ec6a33b1
@ -4149,7 +4149,17 @@ public class EmisBaseService {
|
||||
int totalDays=(emisTransProduct.getMaxAging()+otherAddDay-1)+weekDays+notCaclDays;
|
||||
log.info("计算预估到达时间:[maxAging="+emisTransProduct.getMaxAging()+",weekDays="+weekDays+",notCaclDays="+notCaclDays);
|
||||
// 预估达到时间
|
||||
return DateUtils.addDays(startDate, totalDays);
|
||||
Date estimateDate = DateUtils.addDays(startDate, totalDays);
|
||||
|
||||
// 判断预估到达时间是否为周末,如果是周末则往后加一天
|
||||
Calendar cal = Calendar.getInstance();
|
||||
cal.setTime(estimateDate);
|
||||
int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK);
|
||||
if (dayOfWeek == Calendar.SATURDAY || dayOfWeek == Calendar.SUNDAY) {
|
||||
estimateDate = DateUtils.addDays(estimateDate, 1);
|
||||
}
|
||||
|
||||
return estimateDate;
|
||||
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user