From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackForbidServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackForbidServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackForbidServiceImpl.java
index 999197c..972b0b3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackForbidServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackForbidServiceImpl.java
@@ -108,7 +108,7 @@
dto.setTime(time);
dto.setReason("绾㈠寘浜х敓銆佷娇鐢ㄣ�佽禒閫佺幆鑺傛秹瀚岃繚瑙�");
dto.setHandle("娓呯┖鎵�鏈夌孩鍖呬綑棰�");
- userMoneyMsgNotificationService.redPackMsg(record.getUid(), MsgTypeMoneyTypeEnum.redPackForbid, new Gson().toJson(dto), "灏佺淇℃伅鏃犳硶鐢宠瘔锛岃鎸夌収瑙勫垯浣跨敤绾㈠寘鍔熻兘");
+ userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackForbid, new Gson().toJson(dto), "灏佺鏃犳硶鐢宠瘔锛岃鎸夌収瑙勫垯浣跨敤绾㈠寘鍔熻兘");
}
@@ -131,13 +131,28 @@
} catch (RedPackDetailException e) {
throw new RedPackForbidException(1, e.getMsg());
}
+
+ //娑堟伅
+ MsgRedPackExchangeContentDTO dto = new MsgRedPackExchangeContentDTO();
+ dto.setBalance(redPackBalanceService.getBalance(uid).setScale(2).toString());
+ dto.setMoney(money.setScale(2).toString());
+ dto.setReason("绾㈠寘浜х敓銆佷娇鐢ㄣ�佽禒閫佺幆鑺傛秹瀚岃繚瑙�");
+ userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackDeduct, new Gson().toJson(dto), "鎵ｉ櫎閲戦鏃犳硶鐢宠瘔锛岃鎸夌収瑙勫垯鑾峰緱绾㈠寘");
}
@Override
public void delete(List<Long> idsList) {
if (idsList != null)
- for (Long id : idsList)
+ for (Long id : idsList) {
redPackForbidMapper.deleteByPrimaryKey(id);
+ //娑堟伅
+ MsgRedPackExchangeContentDTO dto = new MsgRedPackExchangeContentDTO();
+ dto.setReason("灏佺鏃堕棿鍒版湡锛岃嚜鍔ㄨВ灏�");
+ dto.setTime("宸插彲浠ラ噸鏂颁娇鐢ㄧ孩鍖呭姛鑳�");
+ dto.setHandle("宸茶娓呯┖");
+ userMoneyMsgNotificationService.redPackMsg(id, MsgTypeMoneyTypeEnum.redPackForbidRemove,
+ new Gson().toJson(dto), null);
+ }
}
--
Gitblit v1.8.0