From 2464548977f4720bc8fceeb5d999c1a3852c2d10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 21 四月 2022 19:38:30 +0800
Subject: [PATCH] 签到与任务
---
app/src/main/java/com/yeshi/makemoney/app/service/impl/goldcorn/GoldCornSettleServiceImpl.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/yeshi/makemoney/app/service/impl/goldcorn/GoldCornSettleServiceImpl.java b/app/src/main/java/com/yeshi/makemoney/app/service/impl/goldcorn/GoldCornSettleServiceImpl.java
index 960a046..035127b 100644
--- a/app/src/main/java/com/yeshi/makemoney/app/service/impl/goldcorn/GoldCornSettleServiceImpl.java
+++ b/app/src/main/java/com/yeshi/makemoney/app/service/impl/goldcorn/GoldCornSettleServiceImpl.java
@@ -17,6 +17,8 @@
import com.yeshi.makemoney.app.service.inter.money.UserMoneyService;
import com.yeshi.makemoney.app.service.inter.user.UserInfoService;
import com.yeshi.makemoney.app.utils.factory.UserMoneyRecordFactory;
+import com.yeshi.makemoney.app.utils.factory.goldcorn.GoldCornConsumeRecordFactory;
+import com.yeshi.makemoney.app.utils.goldcorn.GoldCornUtil;
import com.yeshi.makemoney.app.utils.mq.CMQManager;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -52,7 +54,8 @@
private UserMoneyService userMoneyService;
@Override
- public void startSettle(String day) {
+ public void startSettle(Date date) {
+ String day= GoldCornUtil.getFormatDay(date);
long count = goldCornGetRecordService.countUidsByDay(day);
int pageSize = 1000;
int page = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
@@ -67,15 +70,10 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public void settle(Long uid, String day, BigDecimal rate) throws GoldCornConsumeRecordException, UserMoneyRecordException {
+ public void settle(Long uid, Date day, BigDecimal rate) throws GoldCornConsumeRecordException, UserMoneyRecordException {
long cornNum = goldCornGetRecordService.getGoldCornByDay(uid, day);
//閲戝竵鏁伴噺
- GoldCornConsumeRecord record = new GoldCornConsumeRecord();
- record.setUid(uid);
- record.setCornNum((int) cornNum);
- record.setMoney(rate.multiply(new BigDecimal(record.getCornNum()).setScale(2, RoundingMode.FLOOR)));
- record.setType(GoldCornConsumeType.changeMoney);
- record.setId(uid + "-" + record.getType().name() + "-" + day);
+ GoldCornConsumeRecord record = GoldCornConsumeRecordFactory.createExchange(uid,GoldCornUtil.getFormatDay(day),(int) cornNum,rate);
try {
UserMoneyRecord moneyRecord = UserMoneyRecordFactory.createGoldCornExchange(record);
userMoneyService.addUserMoney(moneyRecord);
@@ -86,7 +84,7 @@
}
@Override
- public void settle(Long uid, String day) throws UserInfoException, GoldCornMoneyExchangeRateRecordException, UserMoneyRecordException, GoldCornConsumeRecordException {
+ public void settle(Long uid, Date day) throws UserInfoException, GoldCornMoneyExchangeRateRecordException, UserMoneyRecordException, GoldCornConsumeRecordException {
UserInfo user = userInfoService.get(uid);
if (user == null) {
throw new UserInfoException(UserInfoException.CODE_NOT_EXIST, "鐢ㄦ埛涓嶅瓨鍦�");
@@ -94,7 +92,7 @@
BigDecimal rate = null;
try {
- rate = goldCornMoneyExchangeRateRecordService.getRate(day, user.getSystem(), new Date());
+ rate = goldCornMoneyExchangeRateRecordService.getRate(GoldCornUtil.getFormatDay(day), user.getSystem(), new Date());
} catch (ParamsException e) {
throw new GoldCornMoneyExchangeRateRecordException(GoldCornMoneyExchangeRateRecordException.CODE_PARAMS_NOT_ENOUGH, e.getMsg());
}
--
Gitblit v1.8.0