From a2c7a947f71d87c44fbb2de149b5a5e46bf7180d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 21 Oct 2022 18:38:43 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java | 9 ++++++---
src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java | 4 ++--
src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml | 5 +----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java
index c634859..41c03ca 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java
@@ -11,11 +11,11 @@
List<IgtOnHookPlanOrder> selectByState(@Param("state")int i);
- Integer updateAvaAmountById(@Param("id")Long id, @Param("profit")BigDecimal balance, @Param("amount")BigDecimal amount);
+ Integer updateAvaAmountById(@Param("id")Long id,@Param("amount")BigDecimal amount);
IgtOnHookPlanOrder selectByMemberId(@Param("memberId")Long memberId);
- Integer addAvaAmountAddProfitById(@Param("id")Long id, @Param("profit")BigDecimal balance, @Param("amount")BigDecimal amount);
+ Integer AddProfitById(@Param("id")Long id, @Param("profit")BigDecimal balance);
BigDecimal selectSumProfitByMemberId(@Param("memberId")Long memberId);
}
diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index 0efc173..93d4470 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -70,10 +70,13 @@
if(ObjectUtil.isNotEmpty(igtOnHookPlanOrderItem)){
igtOnHookPlanOrderItem.setState(1);
igtOnHookPlanOrderItemDao.updateById(igtOnHookPlanOrderItem);
- if(BigDecimal.ZERO.compareTo(igtOnHookPlanOrderItem.getProfit()) < 0){
- //增加挂机主表的挂机总收益和减少挂机剩余金额
+ if(2 == igtOnHookPlanOrderItem.getIsGoal()){
+ //增加挂机主表的挂机总收益
+ Integer updateCount = igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
+ ,igtOnHookPlanOrderItem.getProfit());
+ }else{
+ //减少挂机剩余金额
Integer updateCount = igtOnHookPlanOrderDao.updateAvaAmountById(igtOnHookPlanOrder.getId()
- ,igtOnHookPlanOrderItem.getProfit()
,igtOnHookPlanOrderItem.getAmount());
}
}
diff --git a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
index a4d631a..43648e1 100644
--- a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
+++ b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
@@ -13,7 +13,6 @@
update igt_on_hook_plan_order
set
ava_amount = ava_amount - #{amount},
- profit = profit + #{profit}
where
id = #{id}
and ava_amount - #{amount} <![CDATA[ >= ]]> 0
@@ -29,14 +28,12 @@
limit 1
</select>
- <update id="addAvaAmountAddProfitById">
+ <update id="AddProfitById">
update igt_on_hook_plan_order
set
- ava_amount = ava_amount - #{amount},
profit = profit + #{profit}
where
id = #{id}
- and ava_amount - #{amount} <![CDATA[ >= ]]> 0
</update>
<select id="selectSumProfitByMemberId" resultType="java.math.BigDecimal">
--
Gitblit v1.9.1