From 7d294e1e04095eb4f1c0807406d1ccb8461850cb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 18:24:20 +0800
Subject: [PATCH] 券消息修改
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherCouponContentDTOFactory.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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..8ad154d 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,5 +1,6 @@
package com.yeshi.fanli.util.factory.msg;
+import java.math.BigDecimal;
import java.util.Date;
import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;
@@ -10,9 +11,9 @@
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"));
+ dto.setEndTime(TimeUtil.getGernalTime(endTime.getTime(), "yyyy.MM.dd"));
if (startTime != null)
- dto.setStartTime(TimeUtil.getGernalTime(startTime.getTime(), "yyyy.MM.dd HH:mm"));
+ dto.setStartTime(TimeUtil.getGernalTime(startTime.getTime(), "yyyy.MM.dd"));
dto.setLeftDay(leftDay);
dto.setSource(source);
return dto;
@@ -27,21 +28,24 @@
return dto;
}
- public static MsgOtherCouponContentDTO createWelfareCouponActive(Integer leftDay, Date startTime, Date endTime) {
- MsgOtherCouponContentDTO dto = getGeneral(leftDay, "鎴愬姛閭�璇�1涓槦鍛�", startTime, 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(Date startTime, Date endTime) {
- MsgOtherCouponContentDTO dto = getGeneral(null, "鎴愬姛閭�璇�1涓槦鍛�", startTime, endTime);
- dto.setState("浣跨敤涓紝绛夊緟绯荤粺鍚屾璁㈠崟");
+ public static MsgOtherCouponContentDTO createWelfareCouponUsing(String orderId,BigDecimal money, Date startTime, Date endTime) {
+ MsgOtherCouponContentDTO dto = getGeneral(null, null, startTime, endTime);
+ dto.setOrderId(orderId);
+ dto.setState("宸茬粡浣跨敤");
+ dto.setFanLiMoney(money);
return dto;
}
- public static MsgOtherCouponContentDTO createWelfareCouponUsed(Integer leftDay, Date startTime, Date endTime) {
- MsgOtherCouponContentDTO dto = getGeneral(null, "鎴愬姛閭�璇�1涓槦鍛�", startTime, endTime);
- dto.setState("宸茶浣跨敤");
+ public static MsgOtherCouponContentDTO createWelfareCouponUsed(Integer leftDay,String desc, Date startTime, Date endTime) {
+ MsgOtherCouponContentDTO dto = getGeneral(null, null, startTime, endTime);
+ dto.setState("瀹屾垚鍏嶅崟");
+ dto.setDesc(desc);
return dto;
}
--
Gitblit v1.8.0