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

Merge branch 'test' into dev

This commit is contained in:
wangw 2024-12-10 10:13:25 +08:00
parent d5078718a6 742c4e8735
commit 48311dc69e
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
View File

@ -203,6 +203,9 @@ public class DiscSpinningController {
@Transactional
public void receiveAsync(DiscSpinningRecord receive) {
if (receive.getType() != 2) {
return;
}
UserEntity userInfo = userService.queryByUserId(receive.getUserId());
UserMoneyDetails userMoneyDetails = new UserMoneyDetails(
receive.getUserId(), null, null, "[现金大转盘]", 5, 1, 2,
@ -214,6 +217,7 @@ public class DiscSpinningController {
//存入余额 钱
userMoneyService.updateAmount(1, receive.getUserId(), receive.getNumber().doubleValue());
if (receive.getNumber().compareTo(new BigDecimal("0.1")) > 0 && StringUtils.isNotBlank(userInfo.getZhiFuBao()) && StringUtils.isNotBlank(userInfo.getZhiFuBaoName())) {
//提现
withdraw(userInfo, receive.getNumber().doubleValue());

1
src/main/java/com/sqx/modules/job/task/CashOutTask.java
View File

@ -43,6 +43,7 @@ public class CashOutTask implements ITask {
if (baseResp.getStatus() != null && baseResp.getStatus().equals(2)) {
cashOut.setState(1);
} else {
cashOut.setState(2);
cashOut.setRefund(StringUtils.isNotBlank(baseResp.getMsg()) ? baseResp.getMsg() : baseResp.getErrorMsg());
UserMoneyDetails userMoneyDetails = new UserMoneyDetails(

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

@ -127,7 +127,7 @@ public class WuyouController {
if ("2".equals(notifyDto.getStatus())) {
cashOut.setState(1);
cashOut.setOutAt(DateUtil.now());
} else {
} else if(!cashOut.getState().equals(2)){
cashOut.setState(2);
cashOut.setRefund(notifyDto.getMsg());
@ -137,6 +137,8 @@ public class WuyouController {
//存入余额 钱
userMoneyService.updateAmount(1, cashOut.getUserId(), Double.parseDouble(cashOut.getMoney()));
userMoneyDetailsService.save(userMoneyDetails);
}else{
return "success";
}
cashOutDao.updateById(cashOut);
}