From 8dc8133fb93405c6fc34c9c3c6c6bbce09ebe7f0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 24 十二月 2019 10:52:52 +0800
Subject: [PATCH] 品牌商品更新调整 订单维权修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
index 59fa6f8..6a22ce6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
@@ -109,7 +109,7 @@
// 鍚屼竴闃熷憳鍙褰曚竴娆�
int totalReward = redPackWinInviteMapper.countByUidAndTeamUidAndType(bossId, teamUid,
- RedPackWinInviteTypeEnum.oneStageReward.name());
+ RedPackWinInviteTypeEnum.zeroStageReward.name());
if (totalReward > 0)
return;
@@ -119,7 +119,7 @@
winInvite.setTeamUid(teamUid);
winInvite.setMoney(new BigDecimal(0));
winInvite.setType(RedPackWinInviteTypeEnum.zeroStageReward);
- winInvite.setIdentifyCode(StringUtil.Md5(RedPackWinInviteTypeEnum.oneStageReward.name() + ":" + teamUid));
+ winInvite.setIdentifyCode(StringUtil.Md5(RedPackWinInviteTypeEnum.zeroStageReward.name() + ":" + teamUid));
winInvite.setCreateTime(new Date());
winInvite.setUpdateTime(new Date());
redPackWinInviteMapper.insertSelective(winInvite);
@@ -196,7 +196,7 @@
dto.setNickName(userInfo.getNickName());
dto.setPortrait(userInfo.getPortrait());
userMoneyMsgNotificationService.teamRedPackRewardMsg(bossId, MsgTypeMoneyTypeEnum.redPackOneStageReward, money,
- "闃熷憳锛堝ソ鍙嬶級瀹屾垚绗竴闃舵", new Gson().toJson(dto));
+ "绮変笣锛堝ソ鍙嬶級瀹屾垚绗竴闃舵", new Gson().toJson(dto));
}
@RequestSerializableByKeyService(key = "#uid")
@@ -252,7 +252,7 @@
* @param orderNo
* @param bossId
*/
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
private void twoStageRewardToBoss(Long bossId, Long teamUid, Date oneStageTime, Integer source, String orderNo)
throws Exception {
// 绗竴闃舵瀹屾垚涔嬪悗鐨�90澶╁唴 ; 闃熷弸浜х敓鐨勮鍗曚腑锛堣嚜璐�+鍒嗕韩锛夛紝閭�璇蜂汉绱浜х敓鈮�1 鍏冨閲�
@@ -294,7 +294,7 @@
dto.setNickName(userInfo.getNickName());
dto.setPortrait(userInfo.getPortrait());
userMoneyMsgNotificationService.teamRedPackRewardMsg(bossId, MsgTypeMoneyTypeEnum.redPackTwoStageReward, money,
- "闃熷憳锛堝ソ鍙嬶級瀹屾垚绗簩闃舵", new Gson().toJson(dto));
+ "绮変笣锛堝ソ鍙嬶級瀹屾垚绗簩闃舵", new Gson().toJson(dto));
}
/**
@@ -305,7 +305,7 @@
* @param orderNo
* @param bossId
*/
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
private void threeStageRewardToBoss(Long bossId, Long teamUid, Date twoStageTime, Integer source, String orderNo)
throws Exception {
// 浜屻�佷笁闃舵涓嶅彲鍚屾湀
@@ -363,7 +363,7 @@
dto.setNickName(userInfo.getNickName());
dto.setPortrait(userInfo.getPortrait());
userMoneyMsgNotificationService.teamRedPackRewardMsg(bossId, MsgTypeMoneyTypeEnum.redPackThreeStageReward,
- money, "闃熷憳锛堝ソ鍙嬶級瀹屾垚绗笁闃舵杩炵画[绗�" + monthSpace + "涓湀]", new Gson().toJson(dto));
+ money, "绮変笣锛堝ソ鍙嬶級瀹屾垚绗笁闃舵杩炵画[绗�" + monthSpace + "涓湀]", new Gson().toJson(dto));
}
--
Gitblit v1.8.0