czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' into dev

Browse Source
This commit is contained in:
GYJ
2024-12-25 10:15:55 +08:00
parent 285f1ce4c9 1252d63bfd
commit 593b4cc982
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java
View File

@@ -42,8 +42,6 @@ public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao
ArrayList<Integer> arrayList = new ArrayList<>();
arrayList.add(1);
arrayList.add(6);
arrayList.add(7);
arrayList.add(8);
queryWrapper.in("classify", arrayList);
}
queryWrapper.orderByDesc("create_time");

2
src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
View File

@@ -1491,7 +1491,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
boolean ret = userMoneyDetailsService.save(userMoneyDetails);
if (ret) {
ThreadUtil.execAsync(()->{
discSpinningService.withdrawAsync(entity, money.doubleValue(), "[首绑支付宝]");
discSpinningService.withdrawAsync(entity, money.doubleValue(), "[提现]");
},true);
}
} catch (Exception e) {

2
src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java
View File

@@ -98,7 +98,7 @@ public class DiscSpinningServiceImpl extends ServiceImpl<DiscSpinningDao, DiscSp
@Override
@Transactional
public void withdraw(UserEntity userInfo, Double money) {
withdraw(userInfo, money, "[现金大转盘]");
withdraw(userInfo, money, "[提现]");
}
@Override

6
src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java
View File

@@ -257,7 +257,7 @@ public class WuyouController {
String qdAward = commonRepository.findOne(915).getValue();
UserMoneyDetails userMoneyDetails4 = new UserMoneyDetails(
null, sysUser.getUserId(), null, "[分享达标额外奖励]", 8, 1, 2,
null, sysUser.getUserId(), null, "[分享达标额外奖励]", 6, 1, 2,
new BigDecimal(qdAward), "推广人员首次达标，额外奖励现金红包" + qdAward, 2);
userMoneyService.updateSysMoney(1, sysUser.getUserId(), Double.valueOf(qdAward));
@@ -281,7 +281,7 @@ public class WuyouController {
switch (completAward.getType()) {
case 1:
UserMoneyDetails userMoneyDetails1 = new UserMoneyDetails(
sourceUser.getUserId(), null, null, "[分享达标额外奖励]", 8, 1, 2,
sourceUser.getUserId(), null, null, "[分享达标额外奖励]", 6, 1, 2,
completAward.getAwardNumber(), "邀请人员已有"+completAward.getInviteCount()+"人完成达标任务，额外奖励金币" + completAward.getAwardNumber(), 2);
userMoneyService.updateMoney(1, sourceUser.getUserId(), completAward.getAwardNumber().doubleValue());
@@ -289,7 +289,7 @@ public class WuyouController {
break;
case 2:
UserMoneyDetails userMoneyDetails2 = new UserMoneyDetails(
sourceUser.getUserId(), null, null, "[分享达标额外奖励]", 8, 1, 2,
sourceUser.getUserId(), null, null, "[分享达标额外奖励]", 6, 1, 2,
completAward.getAwardNumber(), "邀请人员已有"+completAward.getInviteCount()+"人完成达标任务，额外奖励现金红包" + completAward.getAwardNumber(), 1);
userMoneyService.updateAmount(1, sourceUser.getUserId(), completAward.getAwardNumber().doubleValue());

4
src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java
View File

@@ -217,7 +217,7 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
switch (reward.getType()) {
case 1:
UserMoneyDetails userMoneyDetails1 = new UserMoneyDetails(
userId, null, null, "[任务中心]", 8, 1, 2,
userId, null, null, "[任务中心]", 7, 1, 2,
new BigDecimal(reward.getNumber()), taskCenter.getTitle() + "任务完成,金币奖励" + reward.getNumber(), 2);
userMoneyService.updateMoney(1, userId, reward.getNumber());
@@ -226,7 +226,7 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
break;
case 2:
UserMoneyDetails userMoneyDetails2 = new UserMoneyDetails(
userId, null, null, "[任务中心]", 8, 1, 2,
userId, null, null, "[任务中心]", 7, 1, 2,
new BigDecimal(reward.getNumber()), taskCenter.getTitle() + "任务完成,现金奖励" + reward.getNumber(), 1);
userMoneyService.updateAmount(1, userId, reward.getNumber());

4
src/main/resources/mapper/app/UserMoneyDetailsDao.xml
View File

@@ -7,11 +7,11 @@
</select>
<select id="queryUserInviteMoney" resultType="Double">
select sum(money) from user_money_details where user_id=#{userId} and classify in (1,6,7,8) and type=1 and state=2 and money_type=1
select sum(money) from user_money_details where user_id=#{userId} and classify in (1,6) and type=1 and state=2 and money_type=1
</select>
<select id="queryUserInviteGoldMoney" resultType="Double">
select sum(money) from user_money_details where user_id=#{userId} and classify in (1,6,7,8) and type=1 and state=2 and money_type=2
select sum(money) from user_money_details where user_id=#{userId} and classify in (1,6) and type=1 and state=2 and money_type=2
</select>