|
@@ -112,12 +112,17 @@ public class MsgUserMessageServiceImpl extends ServiceImpl<MsgUserMessageMapper,
|
|
|
Integer riskNum = getTotalMsgNum(myMsgPage(page));
|
|
|
page.setType("2");
|
|
|
Integer tradeNum = getTotalMsgNum(myMsgPage(page));
|
|
|
+ //其他
|
|
|
page.setType("3");
|
|
|
Integer otherNum = getTotalMsgNum(myMsgPage(page));
|
|
|
+ //费用
|
|
|
+ page.setType("4");
|
|
|
+ Integer costNum = getTotalMsgNum(myMsgPage(page));
|
|
|
MsgUserMessageDto.PageCount pageCount = new MsgUserMessageDto.PageCount()
|
|
|
.setAllNum(allNum)
|
|
|
.setOtherNum(otherNum)
|
|
|
.setRiskNum(riskNum)
|
|
|
+ .setCostNum(riskNum)
|
|
|
.setTradeNum(tradeNum);
|
|
|
|
|
|
return R.ok(pageCount);
|
|
@@ -142,6 +147,11 @@ public class MsgUserMessageServiceImpl extends ServiceImpl<MsgUserMessageMapper,
|
|
|
if ("2".equals(type)) {
|
|
|
msgTypes.add(MsgType.TYPE8.getCode());
|
|
|
}
|
|
|
+ //费用
|
|
|
+ if ("4".equals(type)) {
|
|
|
+ msgTypes.add(MsgType.TYPE9.getCode());
|
|
|
+ }
|
|
|
+
|
|
|
if ("3".equals(type)) {
|
|
|
msgTypesNotIn.add(MsgType.TYPE6.getCode());
|
|
|
msgTypesNotIn.add(MsgType.TYPE8.getCode());
|