From 160c9b86a3dd9cf9823759ba2fa7acdfea40b6d9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 09:57:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java | 158 +---------------------------------------------------
1 files changed, 3 insertions(+), 155 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 f6cd80f..48b2cd3 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
@@ -8,11 +8,9 @@
import org.springframework.transaction.annotation.Transactional;
import com.google.gson.Gson;
-import com.yeshi.fanli.entity.bus.msg.MsgExtra;
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum;
import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.exception.msg.MsgOrderDetailException;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
@@ -22,160 +20,10 @@
public class MsgOrderDetailFactory {
- /**
- * 杩斿埄璁㈠崟
- *
- * @param uid
- * @param orderId
- * @param goodsCount
- * @param orderState
- * @param payMoney
- * @param money
- * @param state
- * @param beiZhu
- * @return
- */
- 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);
- detail.setCreateTime(new Date());
- detail.setGoodsCount(goodsCount);
- detail.setHongBaoMoney(money);
- detail.setOrderId(orderId);
- detail.setOrderType(orderType);
- detail.setPayMoney(payMoney);
- detail.setRead(false);
- detail.setState(orderState);
- detail.setType(MsgTypeOrderTypeEnum.fanli);
- detail.setUser(new UserInfo(uid));
- return detail;
- }
-
- /**
- * 閭�璇疯鍗�
- *
- * @param uid
- * @param orderId
- * @param goodsCount
- * @param orderState
- * @param payMoney
- * @param money
- * @param state
- * @param beiZhu
- * @return
- */
- 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();
- detail.setBeiZhu(beiZhu);
- detail.setCreateTime(new Date());
- detail.setGoodsCount(goodsCount);
- detail.setHongBaoMoney(money);
- detail.setOrderId(orderId);
- detail.setOrderType(orderType);
- detail.setPayMoney(payMoney);
- detail.setRead(false);
- detail.setState(orderState);
- detail.setType(MsgTypeOrderTypeEnum.invite);
- detail.setUser(new UserInfo(uid));
- return detail;
- }
-
- /**
- * 鍒嗕韩璁㈠崟
- *
- * @param uid
- * @param orderId
- * @param goodsCount
- * @param orderState
- * @param payMoney
- * @param money
- * @param state
- * @param beiZhu
- * @return
- */
- 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();
- detail.setBeiZhu(beiZhu);
- detail.setCreateTime(new Date());
- detail.setGoodsCount(goodsCount);
- detail.setHongBaoMoney(money);
- detail.setOrderId(orderId);
- detail.setOrderType(orderType);
- detail.setPayMoney(payMoney);
- detail.setRead(false);
- 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;
- }
- /**
- * 楗夸簡涔堣鍗曟秷鎭�
- * @param uid
- * @param orderId
- * @param orderType
- * @param orderState
- * @param payMoney
- * @param money
- * @param beiZhu
- * @return
- */
- public static MsgOrderDetail createElmeOrder(Long uid, String orderId, int orderType,
- int orderState, BigDecimal payMoney, BigDecimal money, String beiZhu) {
- if (uid == null)
- return null;
- MsgOrderDetail detail = new MsgOrderDetail();
- detail.setBeiZhu(beiZhu);
- detail.setCreateTime(new Date());
- detail.setHongBaoMoney(money);
- detail.setOrderId(orderId);
- detail.setOrderType(orderType);
- detail.setPayMoney(payMoney);
- detail.setRead(false);
- detail.setState(orderState);
- detail.setType(MsgTypeOrderTypeEnum.elme);
- detail.setUser(new UserInfo(uid));
- return detail;
- }
+
+
+
--
Gitblit v1.8.0