From 62a447d89331aee1feae7724c7616aa1bb2cfe79 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 16 十月 2024 14:28:37 +0800
Subject: [PATCH] 将CMQ替换为rabbitmq

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherCouponContentDTOFactory.java |  311 ++++++++++++++++++++++++++++-----------------------
 1 files changed, 171 insertions(+), 140 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherCouponContentDTOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherCouponContentDTOFactory.java
index a4226ad..3f71b4d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherCouponContentDTOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherCouponContentDTOFactory.java
@@ -1,140 +1,171 @@
-package com.yeshi.fanli.util.factory.msg;
-
-import java.util.Date;
-
-import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;
-import com.yeshi.fanli.util.TimeUtil;
-
-public class MsgOtherCouponContentDTOFactory {
-
-	private static MsgOtherCouponContentDTO getGeneral(Integer leftDay, String source, Date startTime, Date endTime) {
-		MsgOtherCouponContentDTO dto = new MsgOtherCouponContentDTO();
-		if (endTime != null)
-			dto.setEndTime(TimeUtil.getGernalTime(endTime.getTime(), "yyyy.MM.dd HH:mm"));
-		if (startTime != null)
-			dto.setStartTime(TimeUtil.getGernalTime(startTime.getTime(), "yyyy.MM.dd HH:mm"));
-		dto.setLeftDay(leftDay);
-		dto.setSource(source);
-		return dto;
-	}
-
-	// 绂忓埄濂栧姳鍒�
-
-	public static MsgOtherCouponContentDTO createWelfareCouponGet(Integer leftDay, String source, Date startTime,
-			Date endTime) {
-		MsgOtherCouponContentDTO dto = getGeneral(leftDay, source, startTime, endTime);
-		dto.setState("鎴愬姛鑾峰緱");
-		return dto;
-	}
-
-	public static MsgOtherCouponContentDTO createWelfareCouponActive(Integer leftDay, Date startTime, Date endTime) {
-		MsgOtherCouponContentDTO dto = getGeneral(leftDay, "鎴愬姛閭�璇�1涓槦鍛�", startTime, endTime);
-		dto.setState("宸茶婵�娲�");
-		return dto;
-	}
-
-	public static MsgOtherCouponContentDTO createWelfareCouponUsing(Date startTime, Date endTime) {
-		MsgOtherCouponContentDTO dto = getGeneral(null, "鎴愬姛閭�璇�1涓槦鍛�", startTime, endTime);
-		dto.setState("浣跨敤涓紝绛夊緟绯荤粺鍚屾璁㈠崟");
-		return dto;
-	}
-
-	public static MsgOtherCouponContentDTO createWelfareCouponUsed(Integer leftDay, Date startTime, Date endTime) {
-		MsgOtherCouponContentDTO dto = getGeneral(null, "鎴愬姛閭�璇�1涓槦鍛�", startTime, endTime);
-		dto.setState("宸茶浣跨敤");
-		return dto;
-	}
-
-	public static MsgOtherCouponContentDTO createWelfareCouponWillOutOfDate(Integer leftDay, Date startTime,
-			Date endTime) {
-		MsgOtherCouponContentDTO dto = getGeneral(leftDay, "鎴愬姛閭�璇�1涓槦鍛�", startTime, endTime);
-		dto.setState("鍗冲皢杩囨湡");
-		return dto;
-	}
-
-	public static MsgOtherCouponContentDTO createWelfareCouponAlreadyOutOfDate(Date startTime, Date endTime) {
-		MsgOtherCouponContentDTO dto = getGeneral(0, "鎴愬姛閭�璇�1涓槦鍛�", startTime, endTime);
-		dto.setState("宸茬粡杩囨湡");
-		return dto;
-	}
-
-	// 鍏嶅崟鍒�
-
-	public static MsgOtherCouponContentDTO createCouponGet(Integer leftDay, String source, Date startTime,
-			Date endTime) {
-		MsgOtherCouponContentDTO dto = getGeneral(leftDay, source, startTime, endTime);
-		dto.setState("鎴愬姛鑾峰緱");
-		return dto;
-	}
-
-	public static MsgOtherCouponContentDTO createCouponActive(Integer leftDay, String source, Date startTime,
-			Date endTime) {
-		MsgOtherCouponContentDTO dto = getGeneral(leftDay, source, startTime, endTime);
-		dto.setState("宸茶婵�娲�");
-		return dto;
-	}
-
-	public static MsgOtherCouponContentDTO createCouponUsing(String source, Date startTime, Date endTime) {
-		MsgOtherCouponContentDTO dto = getGeneral(null, source, startTime, endTime);
-		dto.setState("浣跨敤涓紝绛夊緟绯荤粺鍚屾璁㈠崟");
-		return dto;
-	}
-
-	public static MsgOtherCouponContentDTO createCouponUsed(Integer leftDay, String source, Date startTime,
-			Date endTime) {
-		MsgOtherCouponContentDTO dto = getGeneral(null, source, startTime, endTime);
-		dto.setState("宸茶浣跨敤");
-		return dto;
-	}
-
-	public static MsgOtherCouponContentDTO createCouponWillOutOfDate(Integer leftDay, String source, Date startTime,
-			Date endTime) {
-		MsgOtherCouponContentDTO dto = getGeneral(leftDay, source, startTime, endTime);
-		dto.setState("鍗冲皢杩囨湡");
-		return dto;
-	}
-
-	public static MsgOtherCouponContentDTO createCouponAlreadyOutOfDate(String source, Date startTime, Date endTime) {
-		MsgOtherCouponContentDTO dto = getGeneral(0, source, startTime, endTime);
-		dto.setState("宸茬粡杩囨湡");
-		return dto;
-	}
-
-	// 濂栧姳鍒�
-
-	public static MsgOtherCouponContentDTO createRewardCouponGet(Integer leftDay, String source, Date startTime,
-			Date endTime) {
-		MsgOtherCouponContentDTO dto = getGeneral(leftDay, source, startTime, endTime);
-		dto.setState("鎴愬姛鑾峰緱");
-		return dto;
-	}
-
-	public static MsgOtherCouponContentDTO createRewardCouponActive(Integer leftDay, String source, Date startTime,
-			Date endTime) {
-		MsgOtherCouponContentDTO dto = getGeneral(leftDay, source, startTime, endTime);
-		dto.setState("宸茶婵�娲�");
-		return dto;
-	}
-
-	public static MsgOtherCouponContentDTO createRewardCouponUsed(Integer leftDay, String source, Date startTime,
-			Date endTime) {
-		MsgOtherCouponContentDTO dto = getGeneral(null, source, startTime, endTime);
-		dto.setState("宸茶浣跨敤");
-		return dto;
-	}
-
-	public static MsgOtherCouponContentDTO createRewardCouponWillOutOfDate(Integer leftDay, String source,
-			Date startTime, Date endTime) {
-		MsgOtherCouponContentDTO dto = getGeneral(leftDay, source, startTime, endTime);
-		dto.setState("鍗冲皢杩囨湡");
-		return dto;
-	}
-
-	public static MsgOtherCouponContentDTO createRewardCouponAlreadyOutOfDate(String source, Date startTime,
-			Date endTime) {
-		MsgOtherCouponContentDTO dto = getGeneral(0, source, startTime, endTime);
-		dto.setState("宸茬粡杩囨湡");
-		return dto;
-	}
-
-}
+package com.yeshi.fanli.util.factory.msg;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;
+import org.yeshi.utils.TimeUtil;
+
+public class MsgOtherCouponContentDTOFactory {
+
+	private static MsgOtherCouponContentDTO getGeneral(Integer leftDay, String source, Date startTime, Date endTime) {
+		MsgOtherCouponContentDTO dto = new MsgOtherCouponContentDTO();
+		if (endTime != null)
+			dto.setEndTime(TimeUtil.getGernalTime(endTime.getTime(), "yyyy.MM.dd"));
+		if (startTime != null)
+			dto.setStartTime(TimeUtil.getGernalTime(startTime.getTime(), "yyyy.MM.dd"));
+		dto.setLeftDay(leftDay);
+		dto.setSource(source);
+		return dto;
+	}
+
+	// 绂忓埄濂栧姳鍒�
+
+	public static MsgOtherCouponContentDTO createWelfareCouponGet(Integer leftDay, String source, Date startTime,
+			Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(leftDay, source, startTime, endTime);
+		dto.setState("鎴愬姛鑾峰緱");
+		return dto;
+	}
+
+	public static MsgOtherCouponContentDTO createWelfareCouponActive(Integer leftDay, String source, Date startTime,
+			Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(leftDay, source, startTime, endTime);
+		dto.setState("宸茶婵�娲�");
+		return dto;
+	}
+
+	public static MsgOtherCouponContentDTO createWelfareCouponUsing(String orderId, BigDecimal money, Date startTime,
+			Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(null, null, null, null);
+		dto.setOrderId(orderId);
+		dto.setState("宸茬粡浣跨敤");
+		dto.setFanLiMoney(money);
+		return dto;
+	}
+
+	public static MsgOtherCouponContentDTO createWelfareCouponUsed(String orderId, String desc, Date startTime,
+			Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(null, null, null, null);
+		dto.setState("瀹屾垚鍏嶅崟");
+		dto.setDesc(desc);
+		dto.setOrderId(orderId);
+		return dto;
+	}
+
+	public static MsgOtherCouponContentDTO createWelfareCouponWillOutOfDate(Integer leftDay, Date startTime,
+			Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(leftDay, null, startTime, endTime);
+		dto.setState("鍗冲皢鍒版湡");
+		return dto;
+	}
+
+	public static MsgOtherCouponContentDTO createWelfareCouponAlreadyOutOfDate(String source,Date startTime, Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(null, source, startTime, endTime);
+		dto.setState("宸茬粡杩囨湡");
+		return dto;
+	}
+
+	public static MsgOtherCouponContentDTO createWelfareCouponDrawBack(Integer leftDay, String orderId, Date startTime,
+			Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(leftDay, null, startTime, endTime);
+		dto.setState("宸查��鍥�");
+		dto.setOrderId(orderId);
+		return dto;
+	}
+
+	// 鍏嶅崟鍒�
+
+	public static MsgOtherCouponContentDTO createCouponGet(Integer leftDay, String source, Date startTime,
+			Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(leftDay, source, startTime, endTime);
+		dto.setState("鎴愬姛鑾峰緱");
+		return dto;
+	}
+
+	public static MsgOtherCouponContentDTO createCouponActive(Integer leftDay, String source, Date startTime,
+			Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(leftDay, source, startTime, endTime);
+		dto.setState("宸茶婵�娲�");
+		return dto;
+	}
+
+	public static MsgOtherCouponContentDTO createCouponUsing(String orderId, BigDecimal money, Date startTime,
+			Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(null, null, null, null);
+		dto.setOrderId(orderId);
+		dto.setState("宸茬粡浣跨敤");
+		dto.setFanLiMoney(money);
+		return dto;
+	}
+
+	public static MsgOtherCouponContentDTO createCouponUsed(String orderId, String desc, Date startTime,
+			Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(null, null, null, null);
+		dto.setState("瀹屾垚鍏嶅崟");
+		dto.setDesc(desc);
+		dto.setOrderId(orderId);
+		return dto;
+	}
+
+	public static MsgOtherCouponContentDTO createCouponWillOutOfDate(Integer leftDay, String source, Date startTime,
+			Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(leftDay, source, startTime, endTime);
+		dto.setState("鍗冲皢杩囨湡");
+		return dto;
+	}
+
+	public static MsgOtherCouponContentDTO createCouponAlreadyOutOfDate(String source, Date startTime, Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(0, source, startTime, endTime);
+		dto.setState("宸茬粡杩囨湡");
+		return dto;
+	}
+	
+	public static MsgOtherCouponContentDTO createCouponDrawBack(Integer leftDay, String orderId, Date startTime,
+			Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(leftDay, null, startTime, endTime);
+		dto.setState("宸查��鍥�");
+		dto.setOrderId(orderId);
+		return dto;
+	}
+
+	// 濂栧姳鍒�
+
+	public static MsgOtherCouponContentDTO createRewardCouponGet(Integer leftDay, String source, Date startTime,
+			Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(leftDay, source, startTime, endTime);
+		dto.setState("鎴愬姛鑾峰緱");
+		return dto;
+	}
+
+	public static MsgOtherCouponContentDTO createRewardCouponActive(Integer leftDay, String source, Date startTime,
+			Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(leftDay, source, startTime, endTime);
+		dto.setState("宸茶婵�娲�");
+		return dto;
+	}
+
+	public static MsgOtherCouponContentDTO createRewardCouponUsed(BigDecimal oldFanLiMoney,BigDecimal rewardMoney,String orderId) {
+		MsgOtherCouponContentDTO dto = getGeneral(null, null, null, null);
+		dto.setState("鎴愬姛浣跨敤");
+		dto.setOrderFanLiMoney(oldFanLiMoney);
+		dto.setRewardMoney(rewardMoney);
+		dto.setOrderId(orderId);
+		return dto;
+	}
+
+	public static MsgOtherCouponContentDTO createRewardCouponWillOutOfDate(Integer leftDay, String source,
+			Date startTime, Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(leftDay, source, startTime, endTime);
+		dto.setState("鍗冲皢鍒版湡");
+		return dto;
+	}
+
+	public static MsgOtherCouponContentDTO createRewardCouponAlreadyOutOfDate(String source, Date startTime,
+			Date endTime) {
+		MsgOtherCouponContentDTO dto = getGeneral(null, source, startTime, endTime);
+		dto.setState("宸茬粡杩囨湡");
+		return dto;
+	}
+
+}

--
Gitblit v1.8.0