From 1b78964861ea018243b1822e7f8df073816762ac Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 21 Oct 2022 17:05:34 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
index c238dca..d8ce64d 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
@@ -31,6 +31,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.*;
@Slf4j
@@ -156,7 +157,9 @@
DateTime dateTime = DateUtil.offsetMinute(awardTime, 5);
int orderNum = 1;
for(String profitPlan : isProfitPlan){
- String yyyyMMddHHMM = DateUtil.format(dateTime, "yyyy-MM-dd hh:mm");
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ String yyyyMMddHHMM = sdf.format(dateTime);
DappOnHookAward dappOnHookAwardNext = dappOnHookAwardDao.selectByByAwardTime(yyyyMMddHHMM);
JSONObject jsonObject = JSONUtil.parseObj(profitPlan);
@@ -165,7 +168,8 @@
igtOnHookPlanOrderItem.setOrderId(igtOnHookPlanOrder.getId());
BigDecimal amount = new BigDecimal(jsonObject.get("amount").toString());
igtOnHookPlanOrderItem.setAmount(amount.multiply(new BigDecimal(planCode)));
- igtOnHookPlanOrderItem.setProfit(BigDecimal.ZERO.multiply(new BigDecimal(planCode)));
+ BigDecimal profit = new BigDecimal(jsonObject.get("profit").toString());
+ igtOnHookPlanOrderItem.setProfit(profit.multiply(new BigDecimal(planCode)));
igtOnHookPlanOrderItem.setState(2);
igtOnHookPlanOrderItem.setPlanCode(planCode);
igtOnHookPlanOrderItem.setIsGoal(1);
@@ -256,7 +260,9 @@
Long memberId = dappMemberEntity.getId();
ArrayList<ApiAwardInfoVo> apiAwardInfoVos = new ArrayList<>();
DateTime date = DateUtil.date();
- String yyyyMMddHHMM = DateUtil.format(date, "yyyy-MM-dd hh:mm");
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+ String yyyyMMddHHMM = sdf.format(date);
List<DappOnHookAward> dappOnHookAwards = dappOnHookAwardDao.selectInfoByByAwardTime(yyyyMMddHHMM);
if(CollUtil.isNotEmpty(dappOnHookAwards)){
for(DappOnHookAward dappOnHookAward : dappOnHookAwards){
--
Gitblit v1.9.1