From 4d66b80a56cca390a0d06cc5bc5a9d8c8f790ff8 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期一, 01 六月 2020 19:04:27 +0800 Subject: [PATCH] 团队分红规则修改 --- fanli/src/main/java/com/yeshi/fanli/util/factory/money/TeamEincomeRecordFactory.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/money/TeamEincomeRecordFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/money/TeamEincomeRecordFactory.java index 9847507..ca2048e 100644 --- a/fanli/src/main/java/com/yeshi/fanli/util/factory/money/TeamEincomeRecordFactory.java +++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/money/TeamEincomeRecordFactory.java @@ -4,6 +4,7 @@ import java.util.Date; import com.yeshi.fanli.entity.money.TeamEincomeRecord; +import com.yeshi.fanli.entity.order.dividents.TeamDividentsSourceOrderUserMap; import com.yeshi.fanli.util.TimeUtil; public class TeamEincomeRecordFactory { @@ -76,7 +77,8 @@ * TeamEincomeRecord 杩斿洖绫诲瀷 * @throws */ - public static TeamEincomeRecord createTeamDividents(String day, Long uid, BigDecimal money, String beiZhu) { + public static TeamEincomeRecord createTeamDividents(String day, Long uid, BigDecimal money, int type, + String beiZhu) { TeamEincomeRecord record = new TeamEincomeRecord(); record.setBeiZhu(beiZhu); record.setCreateTime(new Date()); @@ -84,7 +86,10 @@ record.setPreRecieveTime(new Date(TimeUtil.convertToTimeTemp(day, "yyyy-MM-dd"))); record.setRecieveTime(null); record.setState(TeamEincomeRecord.STATE_NOT_RECIEVE); - record.setType(TeamEincomeRecord.TYPE_TEAM_DIVIDENTS); + if (type == TeamDividentsSourceOrderUserMap.TYPE_MORE_THAN_2) { + record.setType(TeamEincomeRecord.TYPE_TEAM_SUBSIDY); + } else + record.setType(TeamEincomeRecord.TYPE_TEAM_DIVIDENTS); record.setUid(uid); return record; } -- Gitblit v1.8.0