Merge remote-tracking branch 'origin/master'

admin

2019-02-26 4fe5f879c1b2919099a6e193ab4db8d25725ca40

 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java

@@ -336,16 +336,12 @@
               items);

      } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.orderReward) {//奖励订单

         contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("邀请订单", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("订单维权", COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("扣除说明", COLOR_TITLE), contentList));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("奖励订单", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",

               COLOR_HIGHLIGHT_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("奖金扣除", COLOR_TITLE), contentList));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("奖励金额", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",

@@ -357,7 +353,7 @@
               COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("备注", COLOR_TITLE), contentList));



         return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_invite_money.png",

         return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_order_reward.png",

               msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),

               items);

      }