From 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 15:33:00 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackForbidServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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..72c53ae 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,6 +131,13 @@
} 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
--
Gitblit v1.8.0