fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java
@@ -202,8 +202,7 @@ for (MsgOrderDetail detail : detailList) { JSONObject params = new JSONObject(); params.put("orderNo", detail.getOrderId()); if (detail.getType() == MsgTypeOrderTypeEnum.share || detail.getType() == MsgTypeOrderTypeEnum.invite || detail.getType() == MsgTypeOrderTypeEnum.orderShare || detail.getType() == MsgTypeOrderTypeEnum.orderInvite) if (detail.getType() == MsgTypeOrderTypeEnum.invite || detail.getType() == MsgTypeOrderTypeEnum.orderInvite) params.put("orderHideNo", UserUtil.filterOrderId(detail.getOrderId())); list.add(UserMsgVOFactory.create(detail, jumpDetailV2Service.getByTypeCache("order_search"), params)); @@ -776,8 +775,7 @@ for (MsgOrderDetail detail : detailList) { JSONObject params = new JSONObject(); params.put("orderNo", detail.getOrderId()); if (detail.getType() == MsgTypeOrderTypeEnum.share || detail.getType() == MsgTypeOrderTypeEnum.invite) if (detail.getType() == MsgTypeOrderTypeEnum.invite || detail.getType() == MsgTypeOrderTypeEnum.orderInvite) params.put("orderHideNo", UserUtil.filterOrderId(detail.getOrderId())); UserMsgVO userMsgVO = UserMsgVOFactory.create(detail, jumpDetailV2Service.getByTypeCache("order_search"), params); fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java
@@ -168,8 +168,7 @@ for (MsgOrderDetail detail : detailList) { JSONObject params = new JSONObject(); params.put("orderNo", detail.getOrderId()); if (detail.getType() == MsgTypeOrderTypeEnum.share || detail.getType() == MsgTypeOrderTypeEnum.invite) if (detail.getType() == MsgTypeOrderTypeEnum.invite || detail.getType() == MsgTypeOrderTypeEnum.orderInvite) params.put("orderHideNo", UserUtil.filterOrderId(detail.getOrderId())); JumpDetailV2 wxmpJumDetail = JumpDetailUtil fanli/src/main/java/com/yeshi/fanli/entity/config/push/PushMsgFactory.java
@@ -38,7 +38,7 @@ String title = Constant.znxConfig.getShareOrderStatisticedTitle(); String content = Constant.znxConfig.getShareOrderStatisticedMsg(); content = content.replace("[订单类型]", Constant.getSourceName(sourceType)) .replace("[订单号]", UserUtil.filterOrderId(orderId)).replace("[金额]", money.toString()); .replace("[订单号]", orderId).replace("[金额]", money.toString()); return new PushContentDTO(title, content); }
@@ -604,9 +604,8 @@ } } // 分享、邀请 隐藏订单号 if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType // 邀请 隐藏订单号 if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) { order.setOrderNo(UserUtil.filterOrderId(order.getOrderNo())); } fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java
@@ -246,7 +246,7 @@ detail.setSubTitle("订单售后"); detail.setType(UserMoneyDetailTypeEnum.shareWeiQuan); detail.setSourceIdentifyId(drawBack.getId()); detail.setDescInfo("订单号：" + UserUtil.filterOrderId(drawBack.getOrderId())); detail.setDescInfo("订单号：" + drawBack.getOrderId()); detail.setUpdateTime(new Date()); detail.setUserInfo(new UserInfo(uid)); detail.setOrderType(Constant.SOURCE_TYPE_TAOBAO); fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
@@ -125,7 +125,7 @@ String orderId = msg.getOrderId(); MsgTypeOrderTypeEnum type = msg.getType(); if (type == MsgTypeOrderTypeEnum.invite || type == MsgTypeOrderTypeEnum.share) { if (type == MsgTypeOrderTypeEnum.invite) { orderId = UserUtil.filterOrderId(orderId); } contentList = new ArrayList<>(); @@ -161,7 +161,7 @@ String orderId = msg.getOrderId(); MsgTypeOrderTypeEnum type = msg.getType(); if (type == MsgTypeOrderTypeEnum.invite || type == MsgTypeOrderTypeEnum.share) { if (type == MsgTypeOrderTypeEnum.invite) { orderId = UserUtil.filterOrderId(orderId); } contentList = new ArrayList<>();
