From 3ce9e928e082ff8abf697dba560cbfbb412e89f8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 11 十一月 2019 15:45:02 +0800
Subject: [PATCH] 商城后台编辑
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackExchangeServiceImpl.java | 71 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 18 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 00dcbf9..d27acd5 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
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.redpack;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -9,16 +10,22 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import com.google.gson.Gson;
import com.yeshi.fanli.dao.mybatis.redpack.RedPackExchangeMapper;
+import com.yeshi.fanli.dto.msg.MsgRedPackExchangeContentDTO;
+import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
+import com.yeshi.fanli.entity.redpack.RedPackBalance;
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.RedPackExchangeException;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.money.UserMoneyService;
+import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;
import com.yeshi.fanli.service.inter.redpack.RedPackConfigService;
import com.yeshi.fanli.service.inter.redpack.RedPackDetailService;
@@ -45,6 +52,9 @@
@Resource
private RedPackDetailService redPackDetailService;
+ @Resource
+ private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
+
@Override
public List<RedPackExchange> query(Integer start, Integer count, String key, Integer state){
@@ -57,19 +67,13 @@
}
@Override
- public List<Long> countState(long uid){
- return redPackExchangeMapper.countState(uid);
- }
-
-
- @Override
- public List<BigDecimal> countMoneyState(long uid){
- return redPackExchangeMapper.countMoneyState(uid);
+ public Long countByUidAndState(long uid, Integer state) {
+ return redPackExchangeMapper.countByUidAndState(uid, state);
}
@Override
- public BigDecimal countMoneyByState(Long uid, Integer state){
- return redPackExchangeMapper.countMoneyByState(uid, state);
+ public BigDecimal countMoneyByUidAndState(Long uid, Integer state){
+ return redPackExchangeMapper.countMoneyByUidAndState(uid, state);
}
@Override
@@ -85,12 +89,19 @@
throw new RedPackExchangeException(1, "鍙傛暟涓嶆纭�");
String extractBanlenMin = redPackConfigService.getValueByKey("extract_banlen_min");
-
- BigDecimal balance = redPackBalanceService.getBalance(uid);
- if (balance == null || balance.compareTo(new BigDecimal(extractBanlenMin)) < 0)
+
+ RedPackBalance balance = redPackBalanceService.selectByPrimaryKey(uid);
+ if (balance == null)
throw new RedPackExchangeException(1, "浣欓涓嶈冻" + extractBanlenMin + "鍏�");
- if (balance.compareTo(amount) < 0)
+ if (balance.getState() != null && balance.getState() == RedPackBalance.STATE_LOCKED)
+ throw new RedPackExchangeException(1, "绾㈠寘宸插皝绂侊紝鎰熻阿浣跨敤");
+
+ BigDecimal balanceMoney = balance.getMoney();
+ if (balanceMoney == null || balanceMoney.compareTo(new BigDecimal(extractBanlenMin)) < 0)
+ throw new RedPackExchangeException(1, "浣欓涓嶈冻" + extractBanlenMin + "鍏�");
+
+ if (balanceMoney.compareTo(amount) < 0)
throw new RedPackExchangeException(1, "鎻愮幇浣欓涓嶈冻");
@@ -125,7 +136,7 @@
if (record == null)
throw new RedPackExchangeException(1,"鐢宠璁板綍宸蹭笉瀛樺湪");
- if (RedPackExchange.STATE_INIT == record.getState())
+ if (RedPackExchange.STATE_INIT != record.getState())
throw new RedPackExchangeException(1,"璇ョ敵璇峰凡琚鐞嗭紝璇峰埛鏂�");
Date nowDate = new Date();
@@ -148,14 +159,28 @@
// 娣诲姞璧勯噾
userMoneyService.addUserMoney(record.getUid(), record.getMoney(), detail);
+ // 鏇存柊绾㈠寘鎻愮幇鏄庣粏
try {
- String identifyCode = StringUtil.Md5(RedPackDetailTypeEnum.redExchangePass.name() + ":" + record.getId());
+ String identifyCode = StringUtil.Md5(RedPackDetailTypeEnum.redExchange.name() + ":" + record.getId());
RedPackDetail redPackDetail = redPackDetailService.getByIdentifyCode(identifyCode);
+ // 鍒涘缓鏄庣粏鏇存柊
RedPackDetail updateDetail = RedPackDetailFactory.updateExchangePass(redPackDetail.getId(), record);
redPackDetailService.updateByPrimaryKeySelective(updateDetail);
} catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
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);
}
@@ -166,7 +191,7 @@
if (record == null)
throw new RedPackExchangeException(1,"鐢宠璁板綍宸蹭笉瀛樺湪");
- if (RedPackExchange.STATE_INIT == record.getState())
+ if (RedPackExchange.STATE_INIT != record.getState())
throw new RedPackExchangeException(1,"璇ョ敵璇峰凡琚鐞嗭紝璇峰埛鏂�");
record.setReason(reason);
@@ -177,10 +202,20 @@
// 閫�鍥炵孩鍖�
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, "绾㈠寘閫�鍥炴椂鍑洪敊");
}
+
+ //娑堟伅
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+ MsgRedPackExchangeContentDTO dto = new MsgRedPackExchangeContentDTO();
+ dto.setTitle("绾㈠寘鎻愮幇");
+ dto.setReason(reason);
+ dto.setHandle(""); // TODO 澶勭悊鏂瑰紡寰呭畾
+ dto.setTime(sd.format(record.getCreateTime()));
+ userMoneyMsgNotificationService.redPackMsg(record.getUid(), MsgTypeMoneyTypeEnum.redPackExchangeReject, new Gson().toJson(dto), null);
}
}
--
Gitblit v1.8.0