From 5647d090f7b83f406abfc390294162bbc6d68fcb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 14:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java
index a954f56..7367531 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java
+++ b/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;
+ }
}
--
Gitblit v1.8.0