From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 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 420b622..d5f3998 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
@@ -24,7 +24,7 @@
*/
public static MsgOrderDetail createFanLiOrder(Long uid, String orderId, int goodsCount, int orderState,
BigDecimal payMoney, BigDecimal money, String beiZhu) {
- if (payMoney == null || money == null || uid == null)
+ if (uid == null)
return null;
MsgOrderDetail detail = new MsgOrderDetail();
detail.setBeiZhu(beiZhu);
@@ -102,4 +102,34 @@
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.setOrderId((orderType == 1 ? "銆愭窐瀹濊鍗曘��" : "") + orderId);
+ 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