|
@@ -70,6 +70,7 @@ public class RabbitLkbQueueListener {
|
|
|
if (lkbActTrade == null) {
|
|
if (lkbActTrade == null) {
|
|
|
lkbActTrade = new KxsLkbActTrade();
|
|
lkbActTrade = new KxsLkbActTrade();
|
|
|
lkbActTrade.setActNum(1);
|
|
lkbActTrade.setActNum(1);
|
|
|
|
|
+ lkbActTrade.setUserId(Integer.valueOf(parse.getUserId()));
|
|
|
lkbActTrade.setTradeMonth(Integer.valueOf(parse.getStatMonth()));
|
|
lkbActTrade.setTradeMonth(Integer.valueOf(parse.getStatMonth()));
|
|
|
lkbActTrade.setTradeDate(Integer.valueOf(parse.getStatDate()));
|
|
lkbActTrade.setTradeDate(Integer.valueOf(parse.getStatDate()));
|
|
|
lkbActTrade.setTotalType(TotalTypeEnum.SELF.getType());
|
|
lkbActTrade.setTotalType(TotalTypeEnum.SELF.getType());
|
|
@@ -91,13 +92,14 @@ public class RabbitLkbQueueListener {
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
KxsLkbActTrade lkbActTradeTeam = kxsLkbActTradeService.getOne(Wrappers.<KxsLkbActTrade>lambdaQuery()
|
|
KxsLkbActTrade lkbActTradeTeam = kxsLkbActTradeService.getOne(Wrappers.<KxsLkbActTrade>lambdaQuery()
|
|
|
- .eq(KxsLkbActTrade::getUserId, parse.getUserId())
|
|
|
|
|
|
|
+ .eq(KxsLkbActTrade::getUserId, userId)
|
|
|
.eq(KxsLkbActTrade::getTradeMonth, parse.getStatMonth())
|
|
.eq(KxsLkbActTrade::getTradeMonth, parse.getStatMonth())
|
|
|
.eq(KxsLkbActTrade::getTradeDate, parse.getStatDate())
|
|
.eq(KxsLkbActTrade::getTradeDate, parse.getStatDate())
|
|
|
.eq(KxsLkbActTrade::getTotalType, TotalTypeEnum.TEAM.getType()));
|
|
.eq(KxsLkbActTrade::getTotalType, TotalTypeEnum.TEAM.getType()));
|
|
|
if (lkbActTradeTeam == null) {
|
|
if (lkbActTradeTeam == null) {
|
|
|
lkbActTradeTeam = new KxsLkbActTrade();
|
|
lkbActTradeTeam = new KxsLkbActTrade();
|
|
|
lkbActTradeTeam.setActNum(1);
|
|
lkbActTradeTeam.setActNum(1);
|
|
|
|
|
+ lkbActTrade.setUserId(Integer.valueOf(userId));
|
|
|
lkbActTradeTeam.setTradeMonth(Integer.valueOf(parse.getStatMonth()));
|
|
lkbActTradeTeam.setTradeMonth(Integer.valueOf(parse.getStatMonth()));
|
|
|
lkbActTradeTeam.setTradeDate(Integer.valueOf(parse.getStatDate()));
|
|
lkbActTradeTeam.setTradeDate(Integer.valueOf(parse.getStatDate()));
|
|
|
lkbActTradeTeam.setTotalType(TotalTypeEnum.TEAM.getType());
|
|
lkbActTradeTeam.setTotalType(TotalTypeEnum.TEAM.getType());
|