From ca3e865a9e3c22fc24c7ca4b67ad8c25d3f2ef18 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 十一月 2019 11:01:31 +0800
Subject: [PATCH] 口令过期消息队列
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackExchangeServiceImpl.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackExchangeServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackExchangeServiceImpl.java
index 1b06307..21b6d72 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackExchangeServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackExchangeServiceImpl.java
@@ -7,7 +7,6 @@
import javax.annotation.Resource;
-import org.omg.CORBA.LongHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -22,6 +21,7 @@
import com.yeshi.fanli.entity.redpack.RedPackDetail;
import com.yeshi.fanli.entity.redpack.RedPackDetail.RedPackDetailTypeEnum;
import com.yeshi.fanli.entity.redpack.RedPackExchange;
+import com.yeshi.fanli.exception.redpack.RedPackBalanceException;
import com.yeshi.fanli.exception.redpack.RedPackExchangeException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.money.UserMoneyService;
@@ -89,14 +89,19 @@
throw new RedPackExchangeException(1, "鍙傛暟涓嶆纭�");
String extractBanlenMin = redPackConfigService.getValueByKey("extract_banlen_min");
+
+ BigDecimal balance = null;
+ try {
+ balance = redPackBalanceService.getBalance(uid);
+ } catch (RedPackBalanceException e1) {
+ throw new RedPackExchangeException(1, e1.getMsg());
+ }
- BigDecimal balance = redPackBalanceService.getBalance(uid);
if (balance == null || balance.compareTo(new BigDecimal(extractBanlenMin)) < 0)
throw new RedPackExchangeException(1, "浣欓涓嶈冻" + extractBanlenMin + "鍏�");
if (balance.compareTo(amount) < 0)
throw new RedPackExchangeException(1, "鎻愮幇浣欓涓嶈冻");
-
String moneyMin = redPackConfigService.getValueByKey("extract_money_min");
String moneyMax = redPackConfigService.getValueByKey("extract_money_max");
@@ -164,16 +169,20 @@
throw new RedPackExchangeException(1,"鏇存柊鎻愮幇鏄庣粏鍑洪敊");
}
- //娑堟伅
- SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm");
- String beizu = "绾㈠寘鎻愮幇鎴愬姛鍚庤鍒扳�滄垜鐨�-璐︽埛浣欓鈥濅腑鏌ョ湅";
- MsgRedPackExchangeContentDTO dto = new MsgRedPackExchangeContentDTO();
- dto.setTitle("绾㈠寘鎻愮幇");
- dto.setTime(sd.format(record.getCreateTime()));
- dto.setHandle("浜哄伐瀹℃牳" + sd.format(new Date()));
- dto.setMoney("楼" + record.getMoney().setScale(2));
- dto.setBalance("楼" + redPackBalanceService.getBalance(record.getUid()));
- userMoneyMsgNotificationService.redPackMsg(record.getUid(), MsgTypeMoneyTypeEnum.redPackExchangePass, new Gson().toJson(dto), beizu);
+ try {
+ //娑堟伅
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+ String beizu = "绾㈠寘鎻愮幇鎴愬姛鍚庤鍒扳�滄垜鐨�-璐︽埛浣欓鈥濅腑鏌ョ湅";
+ MsgRedPackExchangeContentDTO dto = new MsgRedPackExchangeContentDTO();
+ dto.setTitle("绾㈠寘鎻愮幇");
+ dto.setTime(sd.format(record.getCreateTime()));
+ dto.setHandle("浜哄伐瀹℃牳" + sd.format(new Date()));
+ dto.setMoney("楼" + record.getMoney().setScale(2));
+ dto.setBalance("楼" + redPackBalanceService.getBalance(record.getUid()));
+ userMoneyMsgNotificationService.redPackMsg(record.getUid(), MsgTypeMoneyTypeEnum.redPackExchangePass, new Gson().toJson(dto), beizu);
+ } catch (RedPackBalanceException e) {
+ throw new RedPackExchangeException(1, e.getMsg());
+ }
}
@@ -195,7 +204,7 @@
// 閫�鍥炵孩鍖�
try {
- redPackBalanceService.addRedPack(record.getUid(), record.getMoney(), RedPackDetailFactory.createExchange(record));
+ redPackBalanceService.addRedPack(record.getUid(), record.getMoney(), RedPackDetailFactory.createExchangeReject(record));
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
throw new RedPackExchangeException(1, "绾㈠寘閫�鍥炴椂鍑洪敊");
--
Gitblit v1.8.0