From 33bfa1b3d03236922cc95b9435d7d10c91e8c4e5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 22 八月 2019 09:22:59 +0800
Subject: [PATCH] 明细
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java
index 38b279d..e63e0cb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java
@@ -16,6 +16,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
import com.yeshi.fanli.entity.integral.CodePublishRecord;
+import com.yeshi.fanli.entity.integral.IntegralDetail;
import com.yeshi.fanli.entity.integral.IntegralExchange;
import com.yeshi.fanli.entity.integral.IntegralExchange.ExchangeTypeEnum;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
@@ -24,6 +25,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
import com.yeshi.fanli.service.inter.integral.CodePublishRecordService;
+import com.yeshi.fanli.service.inter.integral.IntegralDetailService;
import com.yeshi.fanli.service.inter.integral.IntegralExchangeRecordService;
import com.yeshi.fanli.service.inter.integral.IntegralExchangeService;
import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;
@@ -80,6 +82,8 @@
@Resource
private MsgInviteDetailService msgInviteDetailService;
+ @Resource
+ private IntegralDetailService integralDetailService;
@Override
@@ -212,33 +216,41 @@
}
String thing = "";
+ String thingNum = "";
int couponNews = 0;
try {
if (ExchangeTypeEnum.freeCouponBuy == type) {
thing = "鑷喘鍏嶅崟鍒�";
+ thingNum = "1寮�";
userSystemCouponService.exchangeCoupon(uid, type.name(), UserSystemCoupon.SOURCE_EXCHANGE, null);
couponNews = 1;
} else if (ExchangeTypeEnum.freeCouponGive == type) {
thing = "璧犻�佸厤鍗曞埜";
+ thingNum = "1寮�";
userSystemCouponService.exchangeCoupon(uid, type.name(), UserSystemCoupon.SOURCE_EXCHANGE, null);
couponNews = 1;
} else if (ExchangeTypeEnum.rebatePercentCoupon == type) {
thing = "濂栧姳鍏嶅崟鍒�";
+ thingNum = "3澶�";
String percent = configService.get("exchange_rebate_percent");
userSystemCouponService.exchangeCoupon(uid, type.name(), UserSystemCoupon.SOURCE_EXCHANGE, new BigDecimal(percent));
couponNews = 1;
} else if (ExchangeTypeEnum.inviteCodePublish == type) {
thing = "閭�璇风爜鍙戝竷鍗�";
+ thingNum = "1缁�";
if(codePublishRecordService.countValidRecord(uid) > 0)
throw new IntegralExchangeException(1, "涓夊ぉ涔嬪唴涓嶅彲閲嶅鍏戞崲");
codePublishRecordService.publishInviteCode(uid);
} else if (ExchangeTypeEnum.taoLiJin == type) {
thing = "鎺ㄥ箍绾㈠寘";
+ thingNum = exchange.getAmount() + "鍏�";
userTaoLiJinOriginService.exchangeMoney(uid, exchange.getAmount());
} else if (ExchangeTypeEnum.cash == type) {
thing = "鐜伴噾绾㈠寘";
BigDecimal money = exchange.getAmount();
+ thingNum = money + "鍏�";
+
// 1銆佹彃鍏ョ孩鍖呮暟鎹�
HongBaoV2 hongBaoV2 = new HongBaoV2();
hongBaoV2.setMoney(money);
@@ -282,6 +294,14 @@
// 娣诲姞鍏戞崲璁板綍
integralExchangeRecordService.addExchangeRecord(id, uid);
+
+ // 鍔犲叆鏄庣粏
+ IntegralDetail detail = new IntegralDetail();
+ detail.setUid(uid);
+ detail.setTitle("閲戝竵鍏戞崲-" + thing + "-" + thingNum);
+ detail.setMoney(-goldCoin);
+ detail.setCreateTime(new Date());
+ integralDetailService.insertSelective(detail);
// 娑堟伅
final String things = thing;
@@ -392,7 +412,14 @@
extraUpdate.setGoldCoin(surplus);
userInfoExtraService.saveUserInfoExtra(extraUpdate);
-
+ // 鍔犲叆鏄庣粏
+ IntegralDetail detail = new IntegralDetail();
+ detail.setUid(uid);
+ detail.setTitle("閲戝竵鍏戞崲-閭�璇风爜婵�娲诲崱-1缁�");
+ detail.setMoney(-goldCoin);
+ detail.setCreateTime(new Date());
+ integralDetailService.insertSelective(detail);
+
// 娣诲姞鍏戞崲璁板綍
integralExchangeRecordService.addExchangeRecord(id, uid);
--
Gitblit v1.8.0