## Fix - npe
This commit is contained in:
parent
2b60369535
commit
d3321ce8fa
|
@ -1,6 +1,7 @@
|
||||||
package com.hzs.bonus.bonus.service.impl;
|
package com.hzs.bonus.bonus.service.impl;
|
||||||
|
|
||||||
import cn.hutool.core.collection.CollectionUtil;
|
import cn.hutool.core.collection.CollectionUtil;
|
||||||
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import com.hzs.bonus.achieve.service.ICuMemberRangeService;
|
import com.hzs.bonus.achieve.service.ICuMemberRangeService;
|
||||||
import com.hzs.bonus.achieve.service.ICuMemberRetailRangeService;
|
import com.hzs.bonus.achieve.service.ICuMemberRetailRangeService;
|
||||||
import com.hzs.bonus.base.service.ICuMemberService;
|
import com.hzs.bonus.base.service.ICuMemberService;
|
||||||
|
@ -17,6 +18,7 @@ import com.hzs.common.core.enums.*;
|
||||||
import com.hzs.common.core.utils.ComputeUtil;
|
import com.hzs.common.core.utils.ComputeUtil;
|
||||||
import com.hzs.common.core.utils.DateUtils;
|
import com.hzs.common.core.utils.DateUtils;
|
||||||
import com.hzs.common.domain.bonus.BdBonusDeduct;
|
import com.hzs.common.domain.bonus.BdBonusDeduct;
|
||||||
|
import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
|
||||||
import com.hzs.common.domain.member.achieve.ext.CuMemberRangeExt;
|
import com.hzs.common.domain.member.achieve.ext.CuMemberRangeExt;
|
||||||
import com.hzs.common.domain.member.achieve.ext.CuMemberRetailRangeExt;
|
import com.hzs.common.domain.member.achieve.ext.CuMemberRetailRangeExt;
|
||||||
import com.hzs.common.domain.member.bonus.*;
|
import com.hzs.common.domain.member.bonus.*;
|
||||||
|
@ -1807,8 +1809,11 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
|
||||||
// 上月最后一天
|
// 上月最后一天
|
||||||
String beforeMonthLastDate = DateUtils.beforeMonthLastDateStr(settleDate);
|
String beforeMonthLastDate = DateUtils.beforeMonthLastDateStr(settleDate);
|
||||||
// 上月最后一天期数
|
// 上月最后一天期数
|
||||||
Integer beforeMonthLastPeriod = getCuMemberSettlePeriodService().getCuMemberSettlePeriodByDate(beforeMonthLastDate).getPkId();
|
CuMemberSettlePeriod beforeMonthLast = getCuMemberSettlePeriodService().getCuMemberSettlePeriodByDate(beforeMonthLastDate);
|
||||||
String rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + beforeMonthLastPeriod;
|
String rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE;
|
||||||
|
if(ObjectUtil.isNotEmpty(beforeMonthLast)){
|
||||||
|
rangeTableName += beforeMonthLast.getPkId();
|
||||||
|
}
|
||||||
|
|
||||||
// 查询上月订单
|
// 查询上月订单
|
||||||
// 结算月第一天(上月第一天)
|
// 结算月第一天(上月第一天)
|
||||||
|
|
Loading…
Reference in New Issue