推广红包-不在收回

yujian

2019-07-23 c76ad0e79b95c0bceed8a0234211f2c7f0168b14

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

@@ -15,6 +15,7 @@
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;

import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum;

import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;

import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail.MsgTypeAccountTypeEnum;

import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;

import com.yeshi.fanli.entity.bus.user.BindingAccount;

import com.yeshi.fanli.entity.bus.user.Extract;

@@ -27,6 +28,7 @@
import com.yeshi.fanli.vo.msg.CommonMsgItemVO;

import com.yeshi.fanli.vo.msg.UserMsgVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



public class UserMsgVOFactory {

@@ -79,7 +81,7 @@


      } else {

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

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("订单号", COLOR_TITLE), contentList,true));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("订单号", COLOR_TITLE), contentList, true));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("共", COLOR_CONTENT));

@@ -385,6 +387,27 @@
         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);

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

         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getMoney()) + "", COLOR_HIGHLIGHT_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("补齐金额", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

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

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("补齐原因", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "", COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("账户余额", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "无" : msg.getBeiZhu(),

               COLOR_CONTENT));

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



         return new UserMsgVO("http://img.flqapp.com/resource/money_detail/icon_system.png",

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

               items);

      }



      return null;

@@ -400,7 +423,7 @@
      List<CommonMsgItemVO> items = new ArrayList<>();

      List<ClientTextStyleVO> contentList = new ArrayList<>();



      contentList.add(new ClientTextStyleVO(msg.getType().getDesc() + "", COLOR_CONTENT));

      contentList.add(new ClientTextStyleVO(msg.getTitle() + "", COLOR_CONTENT));

      items.add(new CommonMsgItemVO(new ClientTextStyleVO("事项", COLOR_TITLE), contentList));



      // 状态修改

@@ -409,24 +432,36 @@
      int fromIndex = 0;

      int toIndex = 0;

      String stateDesc = msg.getContent();

      while (stateDesc.indexOf("<highlight>") > -1) {

         fromIndex = stateDesc.indexOf("<highlight>");

         toIndex = stateDesc.indexOf("</highlight>");

         String content1 = stateDesc.substring(0, fromIndex);

         String content2 = stateDesc.substring(fromIndex + "<highlight>".length(), toIndex);

         stateDesc = stateDesc.substring(toIndex + "</highlight>".length(), stateDesc.length());

      if (msg.getType() == MsgTypeAccountTypeEnum.taoBaoAuthFail) {// 淘宝授权失败

         JSONArray array = JSONArray.fromObject(stateDesc);

         for (int i = 0; i < array.size(); i++) {

            String name = array.optJSONObject(i).optString("name");

            String content = array.optJSONObject(i).optString("content");

            contentList = new ArrayList<>();

            contentList.add(new ClientTextStyleVO(content, i > 0 ? COLOR_HIGHLIGHT_CONTENT : COLOR_CONTENT));

            items.add(new CommonMsgItemVO(new ClientTextStyleVO(name, COLOR_TITLE), contentList));

         }



         if (!StringUtil.isNullOrEmpty(content1)) {

            contentList.add(new ClientTextStyleVO(content1, COLOR_CONTENT));

      } else {

         while (stateDesc.indexOf("<highlight>") > -1) {

            fromIndex = stateDesc.indexOf("<highlight>");

            toIndex = stateDesc.indexOf("</highlight>");

            String content1 = stateDesc.substring(0, fromIndex);

            String content2 = stateDesc.substring(fromIndex + "<highlight>".length(), toIndex);

            stateDesc = stateDesc.substring(toIndex + "</highlight>".length(), stateDesc.length());



            if (!StringUtil.isNullOrEmpty(content1)) {

               contentList.add(new ClientTextStyleVO(content1, COLOR_CONTENT));

            }

            if (!StringUtil.isNullOrEmpty(content2)) {

               contentList.add(new ClientTextStyleVO(content2, COLOR_HIGHLIGHT_CONTENT));

            }

         }

         if (!StringUtil.isNullOrEmpty(content2)) {

            contentList.add(new ClientTextStyleVO(content2, COLOR_HIGHLIGHT_CONTENT));

         if (!StringUtil.isNullOrEmpty(stateDesc)) {

            contentList.add(new ClientTextStyleVO(stateDesc, COLOR_CONTENT));

         }

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("状态", COLOR_TITLE), contentList));

      }

      if (!StringUtil.isNullOrEmpty(stateDesc)) {

         contentList.add(new ClientTextStyleVO(stateDesc, COLOR_CONTENT));

      }

      items.add(new CommonMsgItemVO(new ClientTextStyleVO("状态", COLOR_TITLE), contentList));



      contentList = new ArrayList<>();

      contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "无" : msg.getBeiZhu() + "",

@@ -567,6 +602,12 @@
            items.add(new CommonMsgItemVO(new ClientTextStyleVO("来源", COLOR_TITLE), contentList));

         }



         if (!StringUtil.isNullOrEmpty(dto.getTimeDesc())) {

            contentList = new ArrayList<>();

            contentList.add(new ClientTextStyleVO(dto.getTimeDesc() + "", COLOR_CONTENT));

            items.add(new CommonMsgItemVO(new ClientTextStyleVO("时间", COLOR_TITLE), contentList));

         }



         if (dto.getMoney() != null) {

            contentList = new ArrayList<>();

            contentList.add(

@@ -574,6 +615,18 @@
            items.add(new CommonMsgItemVO(new ClientTextStyleVO("面额", COLOR_TITLE), contentList));

         }



         if (!StringUtil.isNullOrEmpty(dto.getReason())) {

            contentList = new ArrayList<>();

            contentList.add(new ClientTextStyleVO(dto.getReason() + "", COLOR_CONTENT));

            items.add(new CommonMsgItemVO(new ClientTextStyleVO("原因", COLOR_TITLE), contentList));

         }



         if (!StringUtil.isNullOrEmpty(dto.getResult())) {

            contentList = new ArrayList<>();

            contentList.add(new ClientTextStyleVO(dto.getResult() + "", COLOR_CONTENT));

            items.add(new CommonMsgItemVO(new ClientTextStyleVO("结果", COLOR_TITLE), contentList));

         }



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "无" : msg.getBeiZhu(),

               COLOR_CONTENT));