## 会员端月新増业绩改为不走月表;
This commit is contained in:
parent
6fad098d32
commit
218eb3773e
|
@ -168,12 +168,12 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
|
||||||
*
|
*
|
||||||
* @param settleTable
|
* @param settleTable
|
||||||
* @param pkMember
|
* @param pkMember
|
||||||
* @param monthTable
|
* @param lastMonthTable
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
CuMemberAwardsUnderVO queryMemberPv(@Param("settleTable") String settleTable,
|
CuMemberAwardsUnderVO queryMemberPv(@Param("settleTable") String settleTable,
|
||||||
@Param("pkMember") Long pkMember,
|
@Param("pkMember") Long pkMember,
|
||||||
@Param("monthTable") String monthTable);
|
@Param("lastMonthTable") String lastMonthTable);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询会员当天业绩
|
* 查询会员当天业绩
|
||||||
|
|
|
@ -147,10 +147,10 @@ public interface ICuMemberTreeService extends IService<CuMemberTree> {
|
||||||
*
|
*
|
||||||
* @param settleTable
|
* @param settleTable
|
||||||
* @param pkMember
|
* @param pkMember
|
||||||
* @param monthTable
|
* @param lastMonthTable
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String monthTable);
|
CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String lastMonthTable);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询会员当天业绩
|
* 查询会员当天业绩
|
||||||
|
|
|
@ -369,18 +369,27 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
|
||||||
if (hasSettle) {
|
if (hasSettle) {
|
||||||
// 昨日业绩 -- 昨日结算表
|
// 昨日业绩 -- 昨日结算表
|
||||||
// 历史业绩 -- 昨日结算表
|
// 历史业绩 -- 昨日结算表
|
||||||
// 当月业绩 -- 月业绩表
|
// // 当月业绩 -- 月业绩表
|
||||||
String month = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM"));
|
// String month = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM"));
|
||||||
// 当月业绩表
|
// // 当月业绩表
|
||||||
String monthTable = TableNameConstants.CU_MEMBER_MONTH + month;
|
// String monthTable = TableNameConstants.CU_MEMBER_MONTH + month;
|
||||||
Integer number = iCuMemberTreeService.queryExistOracleTable(monthTable);
|
// Integer number = iCuMemberTreeService.queryExistOracleTable(monthTable);
|
||||||
|
// if (null == number || number == 0) {
|
||||||
|
// // 月业绩表不存在
|
||||||
|
// monthTable = null;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// 之前月份的最后一期
|
||||||
|
Integer monthLastPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.beforeMonthLastDateStr(new Date())).getPkId();
|
||||||
|
String lastMonthTable = TableNameConstants.CU_MEMBER_SETTLE + monthLastPeriod;
|
||||||
|
Integer number = iCuMemberTreeService.queryExistOracleTable(lastMonthTable);
|
||||||
if (null == number || number == 0) {
|
if (null == number || number == 0) {
|
||||||
// 月业绩表不存在
|
// 月业绩表不存在
|
||||||
monthTable = null;
|
lastMonthTable = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询会员首页业绩显示
|
// 查询会员首页业绩显示
|
||||||
CuMemberAwardsUnderVO awardsUnderVO = iCuMemberTreeService.queryMemberPv(settleTable, pkMember, monthTable);
|
CuMemberAwardsUnderVO awardsUnderVO = iCuMemberTreeService.queryMemberPv(settleTable, pkMember, lastMonthTable);
|
||||||
if (null != awardsUnderVO) {
|
if (null != awardsUnderVO) {
|
||||||
resultVO.setANewPv(null != awardsUnderVO.getANewPv() ? BigDecimalUtil.handleBig10000Down(awardsUnderVO.getANewPv()) : BigDecimal.ZERO);
|
resultVO.setANewPv(null != awardsUnderVO.getANewPv() ? BigDecimalUtil.handleBig10000Down(awardsUnderVO.getANewPv()) : BigDecimal.ZERO);
|
||||||
resultVO.setBNewPv(null != awardsUnderVO.getBNewPv() ? BigDecimalUtil.handleBig10000Down(awardsUnderVO.getBNewPv()) : BigDecimal.ZERO);
|
resultVO.setBNewPv(null != awardsUnderVO.getBNewPv() ? BigDecimalUtil.handleBig10000Down(awardsUnderVO.getBNewPv()) : BigDecimal.ZERO);
|
||||||
|
|
|
@ -147,8 +147,8 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String monthTable) {
|
public CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String lastMonthTable) {
|
||||||
return baseMapper.queryMemberPv(settleTable, pkMember, monthTable);
|
return baseMapper.queryMemberPv(settleTable, pkMember, lastMonthTable);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -613,7 +613,7 @@
|
||||||
<select id="queryMemberPv" resultType="com.hzs.member.achieve.vo.CuMemberAwardsUnderVO">
|
<select id="queryMemberPv" resultType="com.hzs.member.achieve.vo.CuMemberAwardsUnderVO">
|
||||||
select a.*
|
select a.*
|
||||||
<if test="monthTable != null and monthTable != ''">
|
<if test="monthTable != null and monthTable != ''">
|
||||||
, b.a_sum_pv aMonthPv, b.b_sum_pv bMonthPv
|
, a.a_sum_pv - nvl(b.a_sum_pv, 0) aMonthPv, a.b_sum_pv - nvl(b.b_sum_pv, 0) bMonthPv
|
||||||
</if>
|
</if>
|
||||||
from (select
|
from (select
|
||||||
cms.pk_member,
|
cms.pk_member,
|
||||||
|
@ -625,9 +625,9 @@
|
||||||
cms.b_new_pv + cms.rep_b_new_pv b_new_pv
|
cms.b_new_pv + cms.rep_b_new_pv b_new_pv
|
||||||
from ${settleTable} cms
|
from ${settleTable} cms
|
||||||
where cms.pk_member = #{pkMember}) a
|
where cms.pk_member = #{pkMember}) a
|
||||||
<if test="monthTable != null and monthTable != ''">
|
<if test="lastMonthTable != null and lastMonthTable != ''">
|
||||||
left join (select cmm.pk_member, cmm.a_sum_pv, cmm.b_sum_pv
|
left join (select cmm.pk_member, cmm.a_sum_pv, cmm.b_sum_pv
|
||||||
from ${monthTable} cmm
|
from ${lastMonthTable} cmm
|
||||||
where cmm.pk_member = #{pkMember}) b
|
where cmm.pk_member = #{pkMember}) b
|
||||||
on a.pk_member = b.pk_member
|
on a.pk_member = b.pk_member
|
||||||
</if>
|
</if>
|
||||||
|
|
Loading…
Reference in New Issue