From 09c716a16d02ddb06df2bc2af5e588128bc7fdb4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 05 十一月 2019 11:30:41 +0800
Subject: [PATCH] 品牌接口恢复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 102 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java
index 1fe1d30..d295c05 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java
@@ -1,7 +1,9 @@
package com.yeshi.fanli.service.impl.redpack;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
import javax.annotation.Resource;
@@ -9,17 +11,24 @@
import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.DateUtil;
+import com.google.gson.Gson;
import com.yeshi.fanli.dao.mybatis.redpack.RedPackGiveRecordMapper;
+import com.yeshi.fanli.dto.msg.MsgRedPackGiveContentDTO;
+import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;
import com.yeshi.fanli.entity.bus.user.TokenRecord;
import com.yeshi.fanli.entity.bus.user.TokenRecord.TokenTypeEnum;
+import com.yeshi.fanli.entity.redpack.RedPackDetail;
import com.yeshi.fanli.entity.redpack.RedPackDetail.RedPackDetailTypeEnum;
import com.yeshi.fanli.entity.redpack.RedPackGiveRecord;
import com.yeshi.fanli.exception.redpack.RedPackGiveRecordException;
+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;
import com.yeshi.fanli.service.inter.redpack.RedPackGiveRecordService;
import com.yeshi.fanli.service.inter.user.TokenRecordService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TokenUtil;
import com.yeshi.fanli.util.factory.RedPackDetailFactory;
@@ -38,6 +47,57 @@
@Resource
private TokenRecordService tokenRecordService;
+
+ @Resource
+ private RedPackDetailService redPackDetailService;
+
+ @Resource
+ private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
+
+
+ @Override
+ public RedPackGiveRecord selectByPrimaryKey(Long id) {
+ return redPackGiveRecordMapper.selectByPrimaryKey(id);
+ }
+
+ @Override
+ public void updateByPrimaryKeySelective(RedPackGiveRecord record) {
+ redPackGiveRecordMapper.updateByPrimaryKeySelective(record);
+ }
+
+
+ @Override
+ public List<RedPackGiveRecord> overdueList(int count) {
+ return redPackGiveRecordMapper.overdueList(count);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void overdue(List<RedPackGiveRecord> list) throws Exception {
+ if (list == null || list.size() == 0)
+ return;
+
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+ RedPackGiveRecord updateRecord = null;
+ for (RedPackGiveRecord giveRecord: list) {
+ updateRecord = new RedPackGiveRecord();
+ updateRecord.setId(giveRecord.getId());
+ updateRecord.setState(1);
+ redPackGiveRecordMapper.updateByPrimaryKeySelective(updateRecord);
+
+ // 閫�鍥炵孩鍖�
+ redPackBalanceService.addRedPack(giveRecord.getGiveUid(), giveRecord.getAmount(), RedPackDetailFactory.createGiveOthersFail(giveRecord));
+
+ // 閫�鍥炴秷鎭�
+ MsgRedPackGiveContentDTO givedto = new MsgRedPackGiveContentDTO();
+ givedto.setTitle("浣犺禒閫佺殑绾㈠寘鏈鎴愬姛棰嗗彇");
+ givedto.setMoney("楼" + giveRecord.getAmount().setScale(2));
+ givedto.setTime(sd.format(new Date()));
+ givedto.setGiveTime(sd.format(giveRecord.getGiveTime()));
+ userMoneyMsgNotificationService.redPackMsg(giveRecord.getGiveUid(), MsgTypeMoneyTypeEnum.redPackGiveBack, new Gson().toJson(givedto), "璇峰埌鎴戠殑-绾㈠寘鏌ョ湅");
+ }
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
@@ -85,14 +145,54 @@
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", redPackConfigService.getValueByKey("app_down_link")).replace("{闈㈤}",
- amount.setScale(0).toString());
+ amount.setScale(2).toString());
// 鍑忓皯绾㈠寘
try {
- redPackBalanceService.subRedPack(uid, amount, RedPackDetailFactory.createGiveOthers(giveRecord, null, RedPackDetailTypeEnum.giveOthers));
+ redPackBalanceService.subRedPack(uid, amount, RedPackDetailFactory.createGiveOthers(giveRecord));
} catch (Exception e) {
throw new RedPackGiveRecordException(1, "绾㈠寘鍒涘缓澶辫触");
}
return tips;
}
+
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public RedPackGiveRecord receiveFriendsGive(Long uid, Long id) throws RedPackGiveRecordException{
+ RedPackGiveRecord giveRecord = redPackGiveRecordMapper.selectByPrimaryKey(id);
+ if (giveRecord == null || giveRecord.getState() != RedPackGiveRecord.STATE_INIT)
+ throw new RedPackGiveRecordException(1, "璧犻�佽褰曞け鏁堟垨宸茶棰嗗彇");
+
+ Date now = new Date();
+ Date endTime = giveRecord.getEndTime();
+ if (endTime != null && endTime.getTime() < now.getTime())
+ throw new RedPackGiveRecordException(1, "绾㈠寘宸插け鏁堜簡");
+
+ giveRecord.setReceiveUid(uid);
+ giveRecord.setReceiveTime(now);
+ giveRecord.setState(RedPackGiveRecord.STATE_RECEIVE);
+ // 棰嗗彇浜哄鍔犵孩鍖�
+ try {
+ redPackBalanceService.addRedPack(uid, giveRecord.getAmount(), RedPackDetailFactory.createGiveOthersReceive(giveRecord));
+ } catch (Exception e) {
+ throw new RedPackGiveRecordException(1, "绾㈠寘棰嗗彇澶辫触");
+ }
+
+ // 鏇存柊璧犻�佽褰�
+ redPackGiveRecordMapper.updateByPrimaryKey(giveRecord);
+
+ try {
+ String identifyCode = StringUtil.Md5(RedPackDetailTypeEnum.giveOthers.name() + ":" + giveRecord.getId());
+ RedPackDetail redPackDetail = redPackDetailService.getByIdentifyCode(identifyCode);
+
+ RedPackDetail updateDetail = RedPackDetailFactory.createGiveOthersSucceed(redPackDetail.getId(), giveRecord);
+ redPackDetailService.updateByPrimaryKeySelective(updateDetail);
+ } catch (Exception e) {
+ throw new RedPackGiveRecordException(1,"鏇存柊鎻愮幇鏄庣粏鍑洪敊");
+ }
+ return giveRecord;
+ }
+
+
}
--
Gitblit v1.8.0