From 8ba02b125d2df1a3393efdb276daae2244452d45 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 28 十月 2019 18:06:58 +0800
Subject: [PATCH] 返利奖励券新规则调整，订单统计，返利到账优化
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java
index 205bc1a..42f0a4c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.util.factory.msg;
import java.math.BigDecimal;
+import java.util.Calendar;
import java.util.Date;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;
@@ -60,15 +61,15 @@
}
/**
- * 鑷姩鎻愮幇
+ * 鑷姩鎻愮幇
*
* @param extract
* @param uid
* @param beiZhu
* @return
*/
- public static MsgMoneyDetail createExtractAutoMsg(ExtractWeiXinRecord extractRecord, String stateDesc,
- String desc, String beiZhu) {
+ public static MsgMoneyDetail createExtractAutoMsg(ExtractWeiXinRecord extractRecord, String stateDesc, String desc,
+ String beiZhu) {
if (extractRecord == null)
return null;
MsgMoneyDetail detail = new MsgMoneyDetail();
@@ -84,7 +85,6 @@
return detail;
}
-
/**
* 鎻愮幇澶辫触娑堟伅
*
@@ -345,8 +345,7 @@
detail.setUser(new UserInfo(uid));
return detail;
}
-
-
+
public static MsgMoneyDetail createElmeFanliMsg(Long uid, String orderId, BigDecimal money, BigDecimal balance,
String beiZhu) {
if (money == null || money == null || uid == null)
@@ -364,4 +363,36 @@
return detail;
}
+ /**
+ * 閭�璇疯鍗曡ˉ璐�
+ *
+ * @param uid
+ * @param date
+ * @param from
+ * @param money
+ * @param balance
+ * @param beiZhu
+ * @return
+ */
+ public static MsgMoneyDetail createInviteOrderSubSidyMsg(Long uid, Date date, String from, BigDecimal money,
+ BigDecimal balance, String beiZhu) {
+ if (money == null || money == null || uid == null)
+ return null;
+
+ MsgMoneyDetail detail = new MsgMoneyDetail();
+ detail.setBalance(balance);
+ detail.setBeiZhu(beiZhu);
+ detail.setCreateTime(new Date());
+ detail.setMoney(money);
+ detail.setMsgType(MsgTypeMoneyTypeEnum.subSidy);
+ detail.setRead(false);
+ detail.setUser(new UserInfo(uid));
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ detail.setStateDesc(String.format("%s骞�%s鏈堥澶栬ˉ璐村埌璐�", calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)));
+ detail.setDesc(from);
+
+ return detail;
+ }
+
}
--
Gitblit v1.8.0