From fe879975a3e8a0a1aa280fb839e02d159bfbcff8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 18:04:38 +0800
Subject: [PATCH] 金币任务多次获取bug修改
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 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..35bab27 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
@@ -90,17 +90,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 +117,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 +130,7 @@
detail.setMoney(money);
detail.setMsgType(MsgTypeMoneyTypeEnum.fanli);
detail.setOrderId(orderId);
+ detail.setOrderType(orderType);
detail.setRead(false);
detail.setUser(new UserInfo(uid));
@@ -147,8 +147,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 +159,7 @@
detail.setMoney(money);
detail.setMsgType(MsgTypeMoneyTypeEnum.fanliWeiQuan);
detail.setOrderId(orderId);
+ detail.setOrderType(orderType);
detail.setRead(false);
detail.setUser(new UserInfo(uid));
@@ -176,8 +177,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 +192,7 @@
detail.setOrderCount(orderCount);
detail.setRead(false);
detail.setUser(new UserInfo(uid));
+ detail.setOrderType(orderType);
return detail;
}
@@ -205,8 +207,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 +221,7 @@
detail.setOrderId(orderId);
detail.setRead(false);
detail.setUser(new UserInfo(uid));
+ detail.setOrderType(orderType);
return detail;
}
@@ -234,8 +237,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 +247,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 +267,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 +280,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 +297,7 @@
detail.setMsgType(MsgTypeMoneyTypeEnum.orderReward);
detail.setOrderId(orderId);
detail.setRead(false);
+ detail.setOrderType(orderType);
detail.setUser(new UserInfo(uid));
return detail;
}
--
Gitblit v1.8.0