## 查询区域列表时间方法调整;
This commit is contained in:
parent
f0963ead5b
commit
3580fa65c6
|
@ -488,7 +488,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService {
|
||||||
// 获取所有国家的奖金项 key = 国家 + 奖金项的值
|
// 获取所有国家的奖金项 key = 国家 + 奖金项的值
|
||||||
BonusConfigDTO bonusConfigDTO = iBonusItemsServiceApi.queryBonusConfigDTO().getData();
|
BonusConfigDTO bonusConfigDTO = iBonusItemsServiceApi.queryBonusConfigDTO().getData();
|
||||||
// 获取所有区域配置(key:省-市-区,value:会员ID)
|
// 获取所有区域配置(key:省-市-区,value:会员ID)
|
||||||
Map<String, Long> memberRegionMap = iMemberServiceApi.memberRegionMap(DateUtils.getEndTime(currentSettleDate)).getData();
|
Map<String, Long> memberRegionMap = iMemberServiceApi.memberRegionMap(DateUtils.getEndTimeOther(currentSettleDate)).getData();
|
||||||
|
|
||||||
//*********************************计算奖衔 更新奖衔*********************************/
|
//*********************************计算奖衔 更新奖衔*********************************/
|
||||||
// 开始计算奖衔 计算奖衔 更新奖衔(根据最新业绩查询变动且业绩满足下一等级,根据等级判断是否满足考核,安置考核或血缘考核)
|
// 开始计算奖衔 计算奖衔 更新奖衔(根据最新业绩查询变动且业绩满足下一等级,根据等级判断是否满足考核,安置考核或血缘考核)
|
||||||
|
|
|
@ -650,6 +650,22 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
|
||||||
todayEnd.set(Calendar.MILLISECOND, 999);
|
todayEnd.set(Calendar.MILLISECOND, 999);
|
||||||
return todayEnd.getTime();
|
return todayEnd.getTime();
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* 查询结束时间(毫秒给0)
|
||||||
|
*
|
||||||
|
* @return Date
|
||||||
|
*/
|
||||||
|
public static Date getEndTimeOther(Date date) {
|
||||||
|
Calendar todayEnd = Calendar.getInstance();
|
||||||
|
if (null != date) {
|
||||||
|
todayEnd.setTime(date);
|
||||||
|
}
|
||||||
|
todayEnd.set(Calendar.HOUR_OF_DAY, 23);
|
||||||
|
todayEnd.set(Calendar.MINUTE, 59);
|
||||||
|
todayEnd.set(Calendar.SECOND, 59);
|
||||||
|
todayEnd.set(Calendar.MILLISECOND, 0);
|
||||||
|
return todayEnd.getTime();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取月第一天
|
* 获取月第一天
|
||||||
|
|
Loading…
Reference in New Issue