大转盘 领取奖励修改
提现 修改 任务中心 记录 领取记录 是否可领取
This commit is contained in:
@@ -125,22 +125,17 @@ public class WuyouController {
|
||||
if ("2".equals(notifyDto.getStatus())) {
|
||||
cashOut.setState(1);
|
||||
} else {
|
||||
cashOut.setState(2);
|
||||
cashOut.setRefund(notifyDto.getMsg());
|
||||
|
||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||
userMoneyDetails.setClassify(5);
|
||||
userMoneyDetails.setMoney(new BigDecimal(cashOut.getMoney()));
|
||||
userMoneyDetails.setUserId(cashOut.getUserId());
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
|
||||
userMoneyDetails.setContent("提现失败存入余额" + cashOut.getMoney() + "元");
|
||||
userMoneyDetails.setTitle("提现失败");
|
||||
userMoneyDetails.setState(2);
|
||||
userMoneyDetails.setType(1);
|
||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails(
|
||||
cashOut.getUserId(),null,null,"提现失败",4,1,1,
|
||||
new BigDecimal(cashOut.getMoney()),"提现失败存入余额" + cashOut.getMoney() + "元");
|
||||
//存入余额 钱
|
||||
userMoneyService.updateAmount(1, cashOut.getUserId(), Double.parseDouble(cashOut.getMoney()));
|
||||
userMoneyDetailsService.save(userMoneyDetails);
|
||||
}
|
||||
cashOutDao.updateById(cashOut);
|
||||
}
|
||||
return "success";
|
||||
}
|
||||
|
||||
@@ -74,7 +74,7 @@ public class CashOut implements Serializable {
|
||||
private String orderNumber;
|
||||
|
||||
/**
|
||||
* 状态 0待转账 1成功 -1退款
|
||||
* 状态 0待转账 1成功 -1退款 2失败
|
||||
*/
|
||||
private Integer state;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.sqx.modules.pay.service.impl;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
@@ -441,11 +442,10 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
||||
cashOut.setState(0);
|
||||
cashOut.setRate(0.00);
|
||||
cashOut.setUserType(1);
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
String date = sdf.format(new Date());
|
||||
cashOut.setCreateAt(date);
|
||||
cashOut.setCreateAt(DateUtil.now());
|
||||
|
||||
String outOrderNo = AliPayOrderUtil.createOrderId();
|
||||
cashOut.setOrderNumber(outOrderNo);
|
||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||
userMoneyDetails.setUserId(userId);
|
||||
userMoneyDetails.setTitle("[提现]");
|
||||
@@ -454,7 +454,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
||||
userMoneyDetails.setState(1);
|
||||
userMoneyDetails.setClassify(4);
|
||||
userMoneyDetails.setMoney(new BigDecimal(money));
|
||||
userMoneyDetails.setCreateTime(date);
|
||||
userMoneyDetails.setCreateTime(DateUtil.now());
|
||||
UserMoney userMoney;
|
||||
if (isSys) {
|
||||
userMoney = userMoneyService.selectSysUserMoneyByUserId(userId);
|
||||
|
||||
Reference in New Issue
Block a user