From d849e3a1abb07f459d6394adc6b69e7c6e7aeb63 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 28 二月 2019 10:08:08 +0800
Subject: [PATCH] 券消息修改
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherCouponContentDTOFactory.java | 69 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 21 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 8ad154d..5d1a026 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
@@ -28,37 +28,49 @@
return dto;
}
- public static MsgOtherCouponContentDTO createWelfareCouponActive(Integer leftDay, String source, Date startTime, Date endTime) {
+ 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, startTime, endTime);
+ 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(Integer leftDay,String desc, Date startTime, Date endTime) {
- MsgOtherCouponContentDTO dto = getGeneral(null, null, startTime, endTime);
+ 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, "鎴愬姛閭�璇�1涓槦鍛�", startTime, endTime);
- dto.setState("鍗冲皢杩囨湡");
+ MsgOtherCouponContentDTO dto = getGeneral(leftDay, null, startTime, endTime);
+ dto.setState("鍗冲皢鍒版湡");
return dto;
}
- public static MsgOtherCouponContentDTO createWelfareCouponAlreadyOutOfDate(Date startTime, Date endTime) {
- MsgOtherCouponContentDTO dto = getGeneral(0, "鎴愬姛閭�璇�1涓槦鍛�", startTime, endTime);
+ 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;
}
@@ -78,16 +90,21 @@
return dto;
}
- public static MsgOtherCouponContentDTO createCouponUsing(String source, Date startTime, Date endTime) {
- MsgOtherCouponContentDTO dto = getGeneral(null, source, startTime, endTime);
- dto.setState("浣跨敤涓紝绛夊緟绯荤粺鍚屾璁㈠崟");
+ 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(Integer leftDay, String source, Date startTime,
+ public static MsgOtherCouponContentDTO createCouponUsed(String orderId, String desc, Date startTime,
Date endTime) {
- MsgOtherCouponContentDTO dto = getGeneral(null, source, startTime, endTime);
- dto.setState("宸茶浣跨敤");
+ MsgOtherCouponContentDTO dto = getGeneral(null, null, null, null);
+ dto.setState("瀹屾垚鍏嶅崟");
+ dto.setDesc(desc);
+ dto.setOrderId(orderId);
return dto;
}
@@ -101,6 +118,14 @@
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;
}
@@ -120,23 +145,25 @@
return dto;
}
- public static MsgOtherCouponContentDTO createRewardCouponUsed(Integer leftDay, String source, Date startTime,
- Date endTime) {
- MsgOtherCouponContentDTO dto = getGeneral(null, source, startTime, endTime);
- dto.setState("宸茶浣跨敤");
+ 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("鍗冲皢杩囨湡");
+ dto.setState("鍗冲皢鍒版湡");
return dto;
}
public static MsgOtherCouponContentDTO createRewardCouponAlreadyOutOfDate(String source, Date startTime,
Date endTime) {
- MsgOtherCouponContentDTO dto = getGeneral(0, source, startTime, endTime);
+ MsgOtherCouponContentDTO dto = getGeneral(null, source, startTime, endTime);
dto.setState("宸茬粡杩囨湡");
return dto;
}
--
Gitblit v1.8.0