fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -387,6 +387,7 @@ if (time < special.getStartTime().getTime() || time > special.getEndTime().getTime()) { continue; } else { special.setTimeTask(true); special.setCountDownTime((special.getEndTime().getTime() - time) / 1000); } } fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java
@@ -133,6 +133,9 @@ // 是否弹框 @Expose private boolean elastic; @Expose // 是否倒计时 private boolean timeTask; // 背景图片 private String bottomPicture; @@ -148,6 +151,8 @@ private String startTime_str; // 结束时间 private String endTime_str; @Expose private long countDownTime;//倒计时 @@ -431,4 +436,12 @@ this.listLabels = listLabels; } public boolean isTimeTask() { return timeTask; } public void setTimeTask(boolean timeTask) { this.timeTask = timeTask; } } fanli/src/main/java/com/yeshi/fanli/entity/order/OrderMoneyDailyCount.java
@@ -20,6 +20,8 @@ tmall("天猫", "http://img.flqapp.com/resource/icon/source_type_tm.png"), tmallGlobal("天猫国际", "http://img.flqapp.com/resource/icon/source_type_tb.png"), juHuaSuan("聚划算", "http://img.flqapp.com/resource/icon/source_type_tb.png"), huangLv("航旅", "http://img.flqapp.com/resource/icon/source_type_elme.png"), kouBei("口碑", "http://img.flqapp.com/resource/icon/source_type_elme.png"), elme("饿了么", "http://img.flqapp.com/resource/icon/source_type_elme.png"), jingDong("京东", "http://img.flqapp.com/resource/icon/source_type_jd.png"), pinDuoDuo("拼多多", "http://img.flqapp.com/resource/icon/source_type_pdd.png"); fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java
@@ -1,5 +1,6 @@ package com.yeshi.fanli.service.impl.order; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -42,10 +43,18 @@ OrderMoneyDailyCount dailyCount = orderMoneyDailyCountDao.getById(id); if (dailyCount == null) { // 选择性更新 orderMoneyDailyCountDao.save(record); orderMoneyDailyCountDao.updateSelective(record); } else { // 选择性插入 orderMoneyDailyCountDao.updateSelective(record); if (record.getIncome() == null) record.setIncome(BigDecimal.valueOf(0)); if (record.getIncomeTeam() == null) record.setIncomeTeam(BigDecimal.valueOf(0)); if (record.getOrderNum() == null) record.setOrderNum(0); if (record.getOrderNumTeam() == null) record.setOrderNumTeam(0); orderMoneyDailyCountDao.save(record); } }
@@ -54,32 +54,32 @@ } private void initData(TeamDailyRecord record) { if (record.getFirstNum() != null) if (record.getFirstNum() == null) record.setFirstDaRen(0); if (record.getSecondNum() != null) if (record.getSecondNum() == null) record.setSecondNum(0); if (record.getBeyondNum() != null) if (record.getBeyondNum() == null) record.setBeyondNum(0); if (record.getFirstDaRen() != null) if (record.getFirstDaRen() == null) record.setFirstDaRen(0); if (record.getSecondDaRen() != null) if (record.getSecondDaRen() == null) record.setSecondDaRen(0); if (record.getBeyondDaRen() != null) if (record.getBeyondDaRen() == null) record.setBeyondDaRen(0); if (record.getFirstHighVIP() != null) if (record.getFirstHighVIP() == null) record.setFirstHighVIP(0); if (record.getSecondHighVIP() != null) if (record.getSecondHighVIP() == null) record.setSecondHighVIP(0); if (record.getBeyondHighVIP() != null) if (record.getBeyondHighVIP() == null) record.setBeyondHighVIP(0); if (record.getFirstSuperVIP() != null) if (record.getFirstSuperVIP() == null) record.setFirstSuperVIP(0); if (record.getSecondSuperVIP() != null) if (record.getSecondSuperVIP() == null) record.setSecondSuperVIP(0); if (record.getBeyondSuperVIP() != null) if (record.getBeyondSuperVIP() == null) record.setBeyondSuperVIP(0); }
@@ -11,10 +11,11 @@ import org.springframework.stereotype.Service; import com.yeshi.fanli.dao.mybatis.user.vip.TeamUserLevelStatisticMapper; import com.yeshi.fanli.entity.bus.user.ThreeSale; import com.yeshi.fanli.entity.bus.user.UserInviteValidRecord; import com.yeshi.fanli.entity.bus.user.vip.TeamUserLevelStatistic; import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum; import com.yeshi.fanli.service.inter.user.invite.UserInviteValidRecordService; import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce; import com.yeshi.fanli.service.inter.user.vip.TeamUserLevelStatisticService; import com.yeshi.fanli.service.manger.user.UserLevelManager; @@ -28,7 +29,7 @@ private TeamUserLevelStatisticMapper teamUserLevelStatisticMapper; @Resource private UserInviteValidRecordService userInviteValidRecordService; private ThreeSaleSerivce threeSaleSerivce; @Override public TeamUserLevelStatistic selectByUid(Long uid) { @@ -71,13 +72,13 @@ int superFirstCount = 0; int tearcherFirstCount = 0; for (int i = 0; i < 100; i++) { List<UserInviteValidRecord> list = userInviteValidRecordService.listFirstTeam(i * pageSize, pageSize, uid); List<ThreeSale> list = threeSaleSerivce.listFirstTeam(i * pageSize, pageSize, uid); if (list == null || list.size() == 0) { break; } for (UserInviteValidRecord ts : list) { UserLevelEnum level = userLevelManager.getUserLevel(ts.getWorkerId()); for (ThreeSale ts : list) { UserLevelEnum level = userLevelManager.getUserLevel(ts.getWorker().getId()); if (level == UserLevelEnum.daRen || level == UserLevelEnum.normalVIP) { daRenFirstCount++; } else if (level == UserLevelEnum.highVIP) { @@ -96,13 +97,13 @@ int superSecondCount = 0; int tearcherSecondCount = 0; for (int i = 0; i < 100; i++) { List<UserInviteValidRecord> list = userInviteValidRecordService.listSecondTeam(i * pageSize, pageSize, uid); List<ThreeSale> list = threeSaleSerivce.listSecondTeam(i * pageSize, pageSize, uid); if (list == null || list.size() == 0) { break; } for (UserInviteValidRecord ts : list) { UserLevelEnum level = userLevelManager.getUserLevel(ts.getWorkerId()); for (ThreeSale ts : list) { UserLevelEnum level = userLevelManager.getUserLevel(ts.getWorker().getId()); if (level == UserLevelEnum.daRen || level == UserLevelEnum.normalVIP) { daRenSecondCount++; } else if (level == UserLevelEnum.highVIP) {
