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

admin

2020-04-29 5a4dde9e5aae1460e9969753593c5944dc23ad12

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

@@ -41,16 +41,20 @@
         return null;



      String fanliName = "";

      MsgTypeOrderTypeEnum orderTypeEnum = null;

      String sourceName = Constant.getSourceName(source);

      if (Constant.TYPE_REBATE == type) {

         fanliName = "预估返利:";

         sourceName += "-返利订单";

         orderTypeEnum = MsgTypeOrderTypeEnum.orderStatistics;

      } else if (Constant.TYPE_SHAER == type) {

         fanliName = "预估奖金:";

         sourceName += "-分享订单";

         orderTypeEnum = MsgTypeOrderTypeEnum.orderShare;

      } else if (Constant.TYPE_INVITE == type) {

         fanliName = "预估收益:";

         sourceName += "-团队订单";

         orderTypeEnum = MsgTypeOrderTypeEnum.orderInvite;

      }



      // 添加内容

@@ -97,7 +101,7 @@
      detail.setOrderType(source);

      detail.setPayMoney(payMoney);

      detail.setRead(false);

      detail.setType(MsgTypeOrderTypeEnum.orderStatistics);

      detail.setType(orderTypeEnum);

      detail.setUser(new UserInfo(uid));

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

      return detail;

@@ -217,4 +221,46 @@
      return detail;

   }

   

	
   /**

    * 商家跑路

    * @param uid

    * @param orderId

    * @param orderSource

    * @param type

    * @return

    */

   public static MsgOrderDetail orderInvalidToBusinessRunning(Long uid, String orderId, int orderSource, int type) {

      if (uid == null || StringUtil.isNullOrEmpty(orderId))

         return null;

		
      String fanliName = "";

      String sourceName = Constant.getSourceName(orderSource);

      if (Constant.TYPE_REBATE == type) {

         fanliName = "返利订单";

      } else {

         fanliName = "分享订单";

      }

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

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("订单状态", ClientTextStyleVO.COLOR_TITLE),

            new ClientTextStyleVO("商家店铺已被"+sourceName+"封禁，商品佣金已被冻结，无法结算佣金，订单已失效", ClientTextStyleVO.COLOR_CONTENT)));

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("订单详情", ClientTextStyleVO.COLOR_TITLE),

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

      listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("订单号", ClientTextStyleVO.COLOR_TITLE),

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

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

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

		
      MsgOrderDetail detail = new MsgOrderDetail();

      detail.setOrderId(orderId);

      detail.setOrderType(orderSource);

      detail.setType(MsgTypeOrderTypeEnum.businessRunning);

      detail.setUser(new UserInfo(uid));

      detail.setRead(false);

      detail.setCreateTime(new Date());

      detail.setUniquekey(StringUtil.Md5(uid+"&"+ orderId + "&" +orderSource + "&" + MsgTypeOrderTypeEnum.businessRunning.name()));

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

      return detail;

   }

}