From 32f925357776c46bd9e35cf9aad4fdd0f6535d1d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 22 十月 2019 09:21:35 +0800
Subject: [PATCH] 订单奖励修改
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java | 89 +++++++++++++++++++++++++++++++++++---------
1 files changed, 70 insertions(+), 19 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 d4a5e47..205bc1a 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
@@ -7,6 +7,7 @@
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;
import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;
import com.yeshi.fanli.entity.bus.user.Extract;
+import com.yeshi.fanli.entity.bus.user.ExtractWeiXinRecord;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@@ -59,6 +60,32 @@
}
/**
+ * 鑷姩鎻愮幇
+ *
+ * @param extract
+ * @param uid
+ * @param beiZhu
+ * @return
+ */
+ public static MsgMoneyDetail createExtractAutoMsg(ExtractWeiXinRecord extractRecord, String stateDesc,
+ String desc, String beiZhu) {
+ if (extractRecord == null)
+ return null;
+ MsgMoneyDetail detail = new MsgMoneyDetail();
+ detail.setUser(new UserInfo(extractRecord.getUid()));
+ detail.setRead(false);
+ detail.setMoney(extractRecord.getMoney());
+ detail.setMsgType(MsgTypeMoneyTypeEnum.extractAutoWX);
+ detail.setExtract(new Extract(extractRecord.getId()));
+ detail.setStateDesc(stateDesc);
+ detail.setDesc(desc);
+ detail.setBeiZhu(beiZhu);
+ detail.setCreateTime(new Date());
+ return detail;
+ }
+
+
+ /**
* 鎻愮幇澶辫触娑堟伅
*
* @param extract
@@ -90,17 +117,16 @@
* @return
*/
public static MsgMoneyDetail createAlipayAccountValidMsg(AlipayAccountValidNormalHistory valid, Long uid,
- String company, BigDecimal money, String beiZhu) {
- if (valid == null || uid == null || company == null)
+ String appName, BigDecimal money, String beiZhu) {
+ if (valid == null || uid == null || appName == null)
return null;
MsgMoneyDetail detail = new MsgMoneyDetail();
detail.setAlipayAccountValid(valid);
detail.setBeiZhu(beiZhu);
detail.setCreateTime(new Date());
detail.setMoney(money);
- detail.setStateDesc(String
- .format("宸插悜浣犵殑鎻愮幇鏀粯瀹濊浆鍏ヤ竴绗旀潵鑷簬鈥�%s鈥濇�婚涓�%s鍏冪殑杞处锛屾敹鍒板嵆鎻愮幇甯愬彿楠岃瘉鎴愬姛銆�", company, MoneyBigDecimalUtil.getWithNoZera(money))
- .toString());
+ detail.setStateDesc(String.format("浣犵殑鏀粯瀹濆皢鏀跺埌涓�绗旓紝鐞嗙敱\"鏉ヨ嚜浜�%s鐨勬敮浠樺疂楠岃瘉鎵撴\"鍜屽鏂硅处鎴穃"%s鏀粯瀹濋獙璇乗"鐨�%s鍏冭浆璐︺��", appName, appName,
+ MoneyBigDecimalUtil.getWithNoZera(money)).toString());
detail.setMsgType(MsgTypeMoneyTypeEnum.extractValid);
detail.setRead(false);
detail.setUser(new UserInfo(uid));
@@ -118,8 +144,8 @@
* @param beiZhu
* @return
*/
- public static MsgMoneyDetail createFailiMsg(BigDecimal money, BigDecimal balance, String orderId, int goodsCount,
- Long uid, String beiZhu) {
+ public static MsgMoneyDetail createFailiMsg(BigDecimal money, BigDecimal balance, String orderId, int orderType,
+ int goodsCount, Long uid, String beiZhu) {
if (money == null || balance == null || orderId == null || uid == null)
return null;
@@ -131,6 +157,7 @@
detail.setMoney(money);
detail.setMsgType(MsgTypeMoneyTypeEnum.fanli);
detail.setOrderId(orderId);
+ detail.setOrderType(orderType);
detail.setRead(false);
detail.setUser(new UserInfo(uid));
@@ -147,8 +174,8 @@
* @param beiZhu
* @return
*/
- public static MsgMoneyDetail createFailiWeiQuanMsg(Long uid, String orderId, BigDecimal money, BigDecimal balance,
- String beiZhu) {
+ public static MsgMoneyDetail createFailiWeiQuanMsg(Long uid, String orderId, int orderType, BigDecimal money,
+ BigDecimal balance, String beiZhu) {
if (money == null || orderId == null || money == null || uid == null)
return null;
@@ -159,6 +186,7 @@
detail.setMoney(money);
detail.setMsgType(MsgTypeMoneyTypeEnum.fanliWeiQuan);
detail.setOrderId(orderId);
+ detail.setOrderType(orderType);
detail.setRead(false);
detail.setUser(new UserInfo(uid));
@@ -176,8 +204,8 @@
* @param beiZhu
* @return
*/
- public static MsgMoneyDetail createInviteMsg(BigDecimal money, BigDecimal balance, int orderCount, int goodsCount,
- Long uid, String beiZhu) {
+ public static MsgMoneyDetail createInviteMsg(BigDecimal money, BigDecimal balance, int orderType, int orderCount,
+ int goodsCount, Long uid, String beiZhu) {
if (money == null || balance == null || uid == null)
return null;
@@ -191,6 +219,7 @@
detail.setOrderCount(orderCount);
detail.setRead(false);
detail.setUser(new UserInfo(uid));
+ detail.setOrderType(orderType);
return detail;
}
@@ -205,8 +234,8 @@
* @param beiZhu
* @return
*/
- public static MsgMoneyDetail createInviteWeiQuanMsg(Long uid, String orderId, BigDecimal money, BigDecimal balance,
- String beiZhu) {
+ public static MsgMoneyDetail createInviteWeiQuanMsg(Long uid, String orderId, int orderType, BigDecimal money,
+ BigDecimal balance, String beiZhu) {
if (money == null || orderId == null || money == null || uid == null)
return null;
@@ -219,6 +248,7 @@
detail.setOrderId(orderId);
detail.setRead(false);
detail.setUser(new UserInfo(uid));
+ detail.setOrderType(orderType);
return detail;
}
@@ -234,8 +264,8 @@
* @param beiZhu
* @return
*/
- public static MsgMoneyDetail createShareMsg(BigDecimal money, BigDecimal balance, int orderCount, int goodsCount,
- Long uid, String beiZhu) {
+ public static MsgMoneyDetail createShareMsg(BigDecimal money, BigDecimal balance, int orderType, int orderCount,
+ int goodsCount, Long uid, String beiZhu) {
if (money == null || balance == null || uid == null)
return null;
@@ -244,6 +274,7 @@
detail.setBeiZhu(beiZhu);
detail.setCreateTime(new Date());
detail.setGoodsCount(goodsCount);
+ detail.setOrderType(orderType);
detail.setMoney(money);
detail.setMsgType(MsgTypeMoneyTypeEnum.share);
detail.setOrderCount(orderCount);
@@ -263,8 +294,8 @@
* @param beiZhu
* @return
*/
- public static MsgMoneyDetail createShareWeiQuanMsg(Long uid, String orderId, BigDecimal money, BigDecimal balance,
- String beiZhu) {
+ public static MsgMoneyDetail createShareWeiQuanMsg(Long uid, String orderId, int orderType, BigDecimal money,
+ BigDecimal balance, String beiZhu) {
if (money == null || orderId == null || money == null || uid == null)
return null;
MsgMoneyDetail detail = new MsgMoneyDetail();
@@ -276,11 +307,12 @@
detail.setOrderId(orderId);
detail.setRead(false);
detail.setUser(new UserInfo(uid));
+ detail.setOrderType(orderType);
return detail;
}
- public static MsgMoneyDetail createOrderRewardMsg(Long uid, String orderId, BigDecimal money, BigDecimal balance,
- String beiZhu) {
+ public static MsgMoneyDetail createOrderRewardMsg(Long uid, String orderId, int orderType, BigDecimal money,
+ BigDecimal balance, String beiZhu) {
if (money == null || orderId == null || money == null || uid == null)
return null;
@@ -292,6 +324,7 @@
detail.setMsgType(MsgTypeMoneyTypeEnum.orderReward);
detail.setOrderId(orderId);
detail.setRead(false);
+ detail.setOrderType(orderType);
detail.setUser(new UserInfo(uid));
return detail;
}
@@ -312,5 +345,23 @@
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)
+ return null;
+
+ MsgMoneyDetail detail = new MsgMoneyDetail();
+ detail.setBalance(balance);
+ detail.setBeiZhu(beiZhu);
+ detail.setCreateTime(new Date());
+ detail.setMoney(money);
+ detail.setMsgType(MsgTypeMoneyTypeEnum.fanliElme);
+ detail.setOrderId(orderId);
+ detail.setRead(false);
+ detail.setUser(new UserInfo(uid));
+ return detail;
+ }
}
--
Gitblit v1.8.0