Merge remote-tracking branch 'origin/div' into div

yujian

2020-05-11 712fb305d6f79961e879a2f543107e19d7f9e8a2

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

@@ -18,11 +18,9 @@
   public final static int TYPE_TB = 2;// 淘宝

   public final static int TYPE_PHONE = 3;// 电话

   

	
   public final static int WAY_BIND = 1;// 绑定

   public final static int WAY_CHANGE = 2;// 更换

   public final static int WAY_UNBIND = 3;// 解绑

	


   /**

    * 账号绑定成功

@@ -80,8 +78,6 @@
      return detail;

   }



	
	
   /**

    * 账号绑定失败

    * 

@@ -115,14 +111,14 @@
         way = "解绑失败";

      }

      

		
      List<CommonMsgItemVO> listMsg = new ArrayList<>();

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("绑定详情", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO("很抱歉！" + info +"-"+ way, ClientTextStyleVO.COLOR_CONTENT)));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("绑定账号", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO(typeName, ClientTextStyleVO.COLOR_CONTENT)));

      if (!StringUtil.isNullOrEmpty(reason)) {

         listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("失败原因", ClientTextStyleVO.COLOR_TITLE),

         listMsg.add(

               CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("失败原因", ClientTextStyleVO.COLOR_TITLE),

               new ClientTextStyleVO(reason, ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT)));

      }

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("备注", ClientTextStyleVO.COLOR_TITLE),

@@ -137,7 +133,6 @@
      detail.setExtraInfo(new Gson().toJson(listMsg));

      return detail;

   }

	
   

   /**

    * 邀请码修改

@@ -155,14 +150,17 @@
            new ClientTextStyleVO("邀请码修改", ClientTextStyleVO.COLOR_CONTENT)));

      

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

      contentList2.add(new ClientTextStyleVO(String.format("你原邀请码:%s 已经成功修改为新邀请码:", oldCode), ClientTextStyleVO.COLOR_CONTENT));

      contentList2.add(new ClientTextStyleVO(String.format("你原邀请码:%s 已经成功修改为新邀请码:", oldCode),

            ClientTextStyleVO.COLOR_CONTENT));

      contentList2.add(new ClientTextStyleVO(newCode, ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("修改详情", ClientTextStyleVO.COLOR_TITLE),contentList2));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("修改详情", ClientTextStyleVO.COLOR_TITLE),

            contentList2));

      

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

      contentList3.add(new ClientTextStyleVO("原邀请码依然可以使用", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

      contentList3.add(new ClientTextStyleVO("，每个账户ID仅能修改一次", ClientTextStyleVO.COLOR_CONTENT));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("重要提醒", ClientTextStyleVO.COLOR_TITLE),contentList3));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("重要提醒", ClientTextStyleVO.COLOR_TITLE),

            contentList3));

      

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("备注", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO("无", ClientTextStyleVO.COLOR_CONTENT)));

@@ -177,58 +175,37 @@
      return detail;

   }

   





	






	


	
   // artificial

   

   /**

    * 普通会员、高级会员自动提升

    * 人工升级会员消息

    * @Title: artificialVipPreUpgradeSuccess

    * @Description: 
    * @param uid

    * @param originalName

    * @param upName

    * @param days

    * @param targetNum1

    * @param type

    * @param targetNum2

    * @param beizu

    * @return

    * MsgAccountDetail 返回类型

    * @throws

    */

   public static MsgAccountDetail vipPreUpgrade(Long uid, String originalName, String upName, int days,  long targetNum1, 
          Long targetNum2, boolean teamPass) {

   public static MsgAccountDetail artificialVipUpgradeSuccess(Long uid, String originalName, String upName, int days) {

      if (uid == null || originalName == null || upName == null)

         return null;

      

      List<CommonMsgItemVO> listMsg = new ArrayList<>();

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

      contentList.add(new ClientTextStyleVO("恭喜你！有效", ClientTextStyleVO.COLOR_CONTENT));

      if (teamPass) {

         contentList.add(new ClientTextStyleVO("直接粉丝已达", ClientTextStyleVO.COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO(targetNum1+"", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

         contentList.add(new ClientTextStyleVO("人，有效间接粉丝已达", ClientTextStyleVO.COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO(targetNum2+"", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

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

      } else {

         contentList.add(new ClientTextStyleVO("返利+分享订单已达", ClientTextStyleVO.COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO(targetNum1+"", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

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

      }

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("成长说明", ClientTextStyleVO.COLOR_TITLE),contentList));

      

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

      contentList2.add(new ClientTextStyleVO("你的账户已由"+originalName+"升级为", ClientTextStyleVO.COLOR_CONTENT));

      contentList2.add(new ClientTextStyleVO(upName, ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("成长详情", ClientTextStyleVO.COLOR_TITLE),contentList2));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("成长详情", ClientTextStyleVO.COLOR_TITLE),

            contentList2));

      

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

      contentList3.add(new ClientTextStyleVO(days+"", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

      contentList3.add(new ClientTextStyleVO("天", ClientTextStyleVO.COLOR_CONTENT));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("共耗时", ClientTextStyleVO.COLOR_TITLE),contentList3));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("共耗时", ClientTextStyleVO.COLOR_TITLE),

            contentList3));

      

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("对应权益", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO("从收到本消息起，你将获得该账户等级对应的全部权益", ClientTextStyleVO.COLOR_CONTENT)));

@@ -246,7 +223,115 @@
      return detail;

   }

   

   /**

    * 人工升级会员消息失败

    * @Title: artificialVipUpgradeFail

    * @Description: 
    * @param uid

    * @param originalName

    * @param upName

    * @param reson

    * @return 
    * MsgAccountDetail 返回类型

    * @throws

    */

   public static MsgAccountDetail artificialVipUpgradeFail(Long uid, String originalName, String upName,

         String reson) {

      if (uid == null || originalName == null || upName == null)

         return null;

   

      List<CommonMsgItemVO> listMsg = new ArrayList<>();



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

      contentList.add(new ClientTextStyleVO("很抱歉！未通过人工审核 ", ClientTextStyleVO.COLOR_CONTENT));



      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("成长说明", ClientTextStyleVO.COLOR_TITLE),

            contentList));



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

      contentList2.add(new ClientTextStyleVO("你的账户仍是" + originalName, ClientTextStyleVO.COLOR_CONTENT));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("成长详情", ClientTextStyleVO.COLOR_TITLE),

            contentList2));



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

      contentList3.add(new ClientTextStyleVO(reson, ClientTextStyleVO.COLOR_CONTENT));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("拒绝原因", ClientTextStyleVO.COLOR_TITLE),

            contentList3));



      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("备注", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO("如有疑问请联系人工客服", ClientTextStyleVO.COLOR_CONTENT)));



      MsgAccountDetail detail = new MsgAccountDetail();

      detail.setTitle("等级成长");

      detail.setType(MsgTypeAccountTypeEnum.vipPgrade);

      detail.setUser(new UserInfo(uid));

      detail.setCreateTime(new Date());

      detail.setRead(false);

      detail.setExtraInfo(new Gson().toJson(listMsg));

      return detail;

   }



   /**

    * 普通会员、高级会员自动提升

    * @param uid

    * @param originalName

    * @param upName

    * @param days

    * @param targetNum1

    * @param type

    * @param targetNum2

    * @param beizu

    * @return

    */

   public static MsgAccountDetail vipPreUpgrade(Long uid, String originalName, String upName, int days,

         long targetNum1, Long targetNum2, boolean teamPass) {

      if (uid == null || originalName == null || upName == null)

         return null;



      List<CommonMsgItemVO> listMsg = new ArrayList<>();

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

      contentList.add(new ClientTextStyleVO("恭喜你！有效", ClientTextStyleVO.COLOR_CONTENT));

      if (teamPass) {

         contentList.add(new ClientTextStyleVO("直接粉丝已达", ClientTextStyleVO.COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO(targetNum1 + "", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

         contentList.add(new ClientTextStyleVO("人，有效间接粉丝已达", ClientTextStyleVO.COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO(targetNum2 + "", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

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

      } else {

         contentList.add(new ClientTextStyleVO("返利+分享订单已达", ClientTextStyleVO.COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO(targetNum1 + "", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

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

      }

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("成长说明", ClientTextStyleVO.COLOR_TITLE),

            contentList));



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

      contentList2.add(new ClientTextStyleVO("你的账户已由" + originalName + "升级为", ClientTextStyleVO.COLOR_CONTENT));

      contentList2.add(new ClientTextStyleVO(upName, ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("成长详情", ClientTextStyleVO.COLOR_TITLE),

            contentList2));



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

      contentList3.add(new ClientTextStyleVO(days + "", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

      contentList3.add(new ClientTextStyleVO("天", ClientTextStyleVO.COLOR_CONTENT));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("共耗时", ClientTextStyleVO.COLOR_TITLE),

            contentList3));



      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("对应权益", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO("从收到本消息起，你将获得该账户等级对应的全部权益", ClientTextStyleVO.COLOR_CONTENT)));



      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("备注", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO("无", ClientTextStyleVO.COLOR_CONTENT)));



      MsgAccountDetail detail = new MsgAccountDetail();

      detail.setTitle("等级成长");

      detail.setType(MsgTypeAccountTypeEnum.vipPgrade);

      detail.setUser(new UserInfo(uid));

      detail.setCreateTime(new Date());

      detail.setRead(false);

      detail.setExtraInfo(new Gson().toJson(listMsg));

      return detail;

   }

      

   /**

    * 普通会员、高级会员自动提升

@@ -271,12 +356,14 @@
      List<ClientTextStyleVO> contentList2 = new ArrayList<>();

      contentList2.add(new ClientTextStyleVO("你的账户已由高级会员升级为", ClientTextStyleVO.COLOR_CONTENT));

      contentList2.add(new ClientTextStyleVO("超级会员", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("成长详情", ClientTextStyleVO.COLOR_TITLE),contentList2));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("成长详情", ClientTextStyleVO.COLOR_TITLE),

            contentList2));

      

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

      contentList3.add(new ClientTextStyleVO(days+"", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

      contentList3.add(new ClientTextStyleVO("天", ClientTextStyleVO.COLOR_CONTENT));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("共耗时", ClientTextStyleVO.COLOR_TITLE),contentList3));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("共耗时", ClientTextStyleVO.COLOR_TITLE),

            contentList3));

      

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("对应权益", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO("从收到本消息起，你将获得该账户等级对应的全部权益", ClientTextStyleVO.COLOR_CONTENT)));

@@ -293,7 +380,6 @@
      detail.setExtraInfo(new Gson().toJson(listMsg));

      return detail;

   }

	
   

   /**

    * 普通会员、高级会员自动提升

@@ -318,7 +404,8 @@
            new ClientTextStyleVO("你的账户仍是高级会员", ClientTextStyleVO.COLOR_CONTENT)));

      

      if (!StringUtil.isNullOrEmpty(reason)) {

         listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("拒绝原因", ClientTextStyleVO.COLOR_TITLE),

         listMsg.add(

               CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("拒绝原因", ClientTextStyleVO.COLOR_TITLE),

               new ClientTextStyleVO(reason, ClientTextStyleVO.COLOR_CONTENT)));

      }

      

@@ -335,7 +422,6 @@
      return detail;

   }

   

	
   /**

    *  资深导师--运营发出邀约

    * @param uid

@@ -350,7 +436,8 @@
      

      List<CommonMsgItemVO> listMsg = new ArrayList<>();

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("邀约原因", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO("尊敬的"+ nickname+"，你已符合成长为一名资深导师的条件，希望你能加入板栗快省运营团队，与我们共创辉煌", ClientTextStyleVO.COLOR_CONTENT)));

            new ClientTextStyleVO("尊敬的" + nickname + "，你已符合成长为一名资深导师的条件，希望你能加入板栗快省运营团队，与我们共创辉煌",

                  ClientTextStyleVO.COLOR_CONTENT)));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("专属客服", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO(kefuName + "-微信号:" +kefuWX, ClientTextStyleVO.COLOR_CONTENT)));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("对应权益", ClientTextStyleVO.COLOR_TITLE),

@@ -368,7 +455,6 @@
      return detail;

   }

   

	
   /**

    *  资深导师--运营发出邀约

    * @param uid

@@ -385,12 +471,14 @@
      List<ClientTextStyleVO> contentList = new ArrayList<>();

      contentList.add(new ClientTextStyleVO("恭喜你！你的账户已由超级会员升级为", ClientTextStyleVO.COLOR_CONTENT));

      contentList.add(new ClientTextStyleVO("资深导师", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("成长详情", ClientTextStyleVO.COLOR_TITLE), contentList));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("成长详情", ClientTextStyleVO.COLOR_TITLE),

            contentList));

      

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

      contentList2.add(new ClientTextStyleVO(days+ "", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

      contentList2.add(new ClientTextStyleVO("天", ClientTextStyleVO.COLOR_CONTENT));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("成长详情", ClientTextStyleVO.COLOR_TITLE), contentList2));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("成长详情", ClientTextStyleVO.COLOR_TITLE),

            contentList2));

      

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("邀约原因", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO("从收到本消息起，你将获得该账户等级对应的全部权益", ClientTextStyleVO.COLOR_CONTENT)));