From 2a99c607e5c7dc640d3608b35a20b451e42922c3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 17 九月 2019 09:45:02 +0800
Subject: [PATCH] 品牌
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 43 insertions(+), 10 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 86d48b2..a8792c4 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
@@ -22,9 +22,9 @@
* @param beiZhu
* @return
*/
- public static MsgOrderDetail createFanLiOrder(Long uid, String orderId, int goodsCount, int orderState,
- BigDecimal payMoney, BigDecimal money, int state, String beiZhu) {
- if (payMoney == null || money == null || uid == null)
+ public static MsgOrderDetail createFanLiOrder(Long uid, String orderId, int orderType, int goodsCount,
+ int orderState, BigDecimal payMoney, BigDecimal money, String beiZhu) {
+ if (uid == null)
return null;
MsgOrderDetail detail = new MsgOrderDetail();
detail.setBeiZhu(beiZhu);
@@ -32,9 +32,10 @@
detail.setGoodsCount(goodsCount);
detail.setHongBaoMoney(money);
detail.setOrderId(orderId);
+ detail.setOrderType(orderType);
detail.setPayMoney(payMoney);
detail.setRead(false);
- detail.setState(state);
+ detail.setState(orderState);
detail.setType(MsgTypeOrderTypeEnum.fanli);
detail.setUser(new UserInfo(uid));
return detail;
@@ -53,8 +54,8 @@
* @param beiZhu
* @return
*/
- public static MsgOrderDetail createInviteOrder(Long uid, String orderId, int goodsCount, int orderState,
- BigDecimal payMoney, BigDecimal money, int state, String beiZhu) {
+ public static MsgOrderDetail createInviteOrder(Long uid, String orderId, int orderType, int goodsCount,
+ int orderState, BigDecimal payMoney, BigDecimal money, String beiZhu) {
if (payMoney == null || money == null || uid == null)
return null;
MsgOrderDetail detail = new MsgOrderDetail();
@@ -63,9 +64,10 @@
detail.setGoodsCount(goodsCount);
detail.setHongBaoMoney(money);
detail.setOrderId(orderId);
+ detail.setOrderType(orderType);
detail.setPayMoney(payMoney);
detail.setRead(false);
- detail.setState(state);
+ detail.setState(orderState);
detail.setType(MsgTypeOrderTypeEnum.invite);
detail.setUser(new UserInfo(uid));
return detail;
@@ -84,8 +86,8 @@
* @param beiZhu
* @return
*/
- public static MsgOrderDetail createShareOrder(Long uid, String orderId, int goodsCount, int orderState,
- BigDecimal payMoney, BigDecimal money, int state, String beiZhu) {
+ public static MsgOrderDetail createShareOrder(Long uid, String orderId, int orderType, int goodsCount,
+ int orderState, BigDecimal payMoney, BigDecimal money, String beiZhu) {
if (payMoney == null || money == null || uid == null)
return null;
MsgOrderDetail detail = new MsgOrderDetail();
@@ -94,12 +96,43 @@
detail.setGoodsCount(goodsCount);
detail.setHongBaoMoney(money);
detail.setOrderId(orderId);
+ detail.setOrderType(orderType);
detail.setPayMoney(payMoney);
detail.setRead(false);
- detail.setState(state);
+ detail.setState(orderState);
detail.setType(MsgTypeOrderTypeEnum.share);
detail.setUser(new UserInfo(uid));
return detail;
}
+ /**
+ * 璁㈠崟鎵惧洖
+ *
+ * @param uid
+ * @param orderId
+ * -璁㈠崟鍙�
+ * @param isSuccess-鏄惁鎵惧洖鎴愬姛
+ * @param payMoney
+ * @param orderType
+ * 1-娣樺疂璁㈠崟 3-鎷煎澶氳鍗� 4-浜笢璁㈠崟
+ * @param beiZhu
+ * @return
+ */
+ public static MsgOrderDetail createFoundOrder(Long uid, String orderId, boolean isSuccess, BigDecimal payMoney,
+ int orderType, Date happendDate, String beiZhu) {
+ if (orderId == null || uid == null)
+ return null;
+ MsgOrderDetail detail = new MsgOrderDetail();
+ detail.setBeiZhu(beiZhu);
+ detail.setCreateTime(new Date());
+ detail.setOrderType(orderType);
+ detail.setPayMoney(payMoney);
+ detail.setRead(false);
+ detail.setState(isSuccess ? 1 : 0);
+ detail.setType(MsgTypeOrderTypeEnum.found);
+ detail.setUser(new UserInfo(uid));
+ detail.setHappendDate(happendDate);
+ return detail;
+ }
+
}
--
Gitblit v1.8.0