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

Merge branch 'dev' into test

Browse Source 
# Conflicts:
#	src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
This commit is contained in:
wangw
2024-12-06 11:17:20 +08:00
parent 5ea41773c7 16a823d330
commit c6dae69abc
6 changed files with 81 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,29 +166,39 @@ public class DiscSpinningController {
if (StringUtils.isNotBlank(userInfo.getZhiFuBao()) && StringUtils.isNotBlank(userInfo.getZhiFuBaoName())) {
receive.setTarget("1");
//提现
withdraw(receive, receive.getUserId(), receive.getNumber().doubleValue());
} else {
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
userMoneyDetails.setClassify(5);
userMoneyDetails.setMoney(receive.getNumber());
userMoneyDetails.setUserId(receive.getUserId());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
userMoneyDetails.setContent("现金大转盘:现金红包奖励");
userMoneyDetails.setTitle("现金大转盘:现金红包奖励" + receive.getNumber() + "元");
userMoneyDetails.setState(2);
userMoneyDetails.setType(1);
//存入余额 钱
userMoneyService.updateAmount(1, receive.getUserId(), receive.getNumber().doubleValue());
receive.setTarget("2");
userMoneyDetailsService.save(userMoneyDetails);
receive.setTargetId(userMoneyDetails.getId());
String result = withdraw(receive, receive.getUserId(), receive.getNumber().doubleValue());
recordService.updateById(receive);
if (StringUtils.isBlank(result)) {
return Result.success();
}
if ("提现成功，将在三个工作日内到账，请耐心等待！".equals(result)) {
return Result.success(result);
}
}
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
userMoneyDetails.setClassify(5);
userMoneyDetails.setMoney(receive.getNumber());
userMoneyDetails.setUserId(receive.getUserId());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
userMoneyDetails.setContent("现金大转盘:现金红包奖励");
userMoneyDetails.setTitle("现金大转盘:现金红包奖励" + receive.getNumber() + "元");
userMoneyDetails.setState(2);
userMoneyDetails.setType(1);
//存入余额 钱
userMoneyService.updateAmount(1, receive.getUserId(), receive.getNumber().doubleValue());
receive.setTarget("2");
userMoneyDetailsService.save(userMoneyDetails);
receive.setTargetId(userMoneyDetails.getId());
recordService.updateById(receive);
return Result.success();
}
public void withdraw(DiscSpinningRecord record, Long userId, Double money) {
public String withdraw(DiscSpinningRecord record, Long userId, Double money) {
UserEntity userInfo = userService.queryByUserId(userId);
//最高提现金额
CommonInfo one2 = commonRepository.findOne(910);
@@ -207,17 +217,21 @@ public class DiscSpinningController {
cashOut.setCreateAt(date);
if (one2 != null && money >= Double.parseDouble(one2.getValue())) {
cashOutService.saveBody(cashOut);
return;
return "提现成功，将在三个工作日内到账，请耐心等待！";
}
String outOrderNo = AliPayOrderUtil.createOrderId();
cashOut.setOrderNumber(outOrderNo);
BaseResp baseResp = WuyouPay.extractOrder(outOrderNo, cashOut.getMoney(), cashOut.getZhifubao(), cashOut.getZhifubaoName());
if (baseResp.getStatus().equals(2)) {
if (baseResp.getStatus() != null && baseResp.getStatus().equals(2)) {
cashOut.setState(1);
} else if (StringUtils.isNotBlank(baseResp.getErrorMsg())) {
return baseResp.getErrorMsg();
}
cashOutService.saveBody(cashOut);
record.setTargetId(cashOut.getId());
return "";
}
@Transactional