yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提现

This commit is contained in:
曹磊 2024-08-13 10:49:46 +08:00
parent d7259796b1
commit 12c61d09f1
4 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/sqx/modules/pay/controller/CashController.java
View File

@ -360,7 +360,7 @@ public class CashController {
cashOutService.update(one); cashOutService.update(one);
UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
userMoneyDetails.setUserId(one.getUserMoneyDetailId()); userMoneyDetails.setId(one.getUserMoneyDetailId());
userMoneyDetails.setState(2); userMoneyDetails.setState(2);
userMoneyDetailsService.updateById(userMoneyDetails); userMoneyDetailsService.updateById(userMoneyDetails);
@ -403,6 +403,12 @@ public class CashController {
one.setOutAt(sdf.format(new Date())); one.setOutAt(sdf.format(new Date()));
//更新转账订单 //更新转账订单
cashOutService.update(one); cashOutService.update(one);
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
userMoneyDetails.setId(one.getUserMoneyDetailId());
userMoneyDetails.setState(2);
userMoneyDetailsService.updateById(userMoneyDetails);
//查询用户 //查询用户
UserEntity userInfo=userService.queryByUserId(one.getUserId()); UserEntity userInfo=userService.queryByUserId(one.getUserId());
cashOutService.cashOutSuccess(userInfo, one.getOutAt(), one.getMoney(), one.getZhifubao(), commonInfoService.findOne(19).getValue()); cashOutService.cashOutSuccess(userInfo, one.getOutAt(), one.getMoney(), one.getZhifubao(), commonInfoService.findOne(19).getValue());
@ -425,7 +431,7 @@ public class CashController {
cashOutService.update(one); cashOutService.update(one);
UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
userMoneyDetails.setUserId(one.getUserMoneyDetailId()); userMoneyDetails.setId(one.getUserMoneyDetailId());
userMoneyDetails.setState(2); userMoneyDetails.setState(2);
userMoneyDetailsService.updateById(userMoneyDetails); userMoneyDetailsService.updateById(userMoneyDetails);
@ -469,7 +475,7 @@ public class CashController {
cashOutService.update(one); cashOutService.update(one);
UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
userMoneyDetails.setUserId(one.getUserMoneyDetailId()); userMoneyDetails.setId(one.getUserMoneyDetailId());
userMoneyDetails.setState(2); userMoneyDetails.setState(2);
userMoneyDetailsService.updateById(userMoneyDetails); userMoneyDetailsService.updateById(userMoneyDetails);
@ -505,21 +511,23 @@ public class CashController {
if(userInfo!=null){ if(userInfo!=null){
//将金额退还 //将金额退还
userMoneyService.updateMoney(1,userId,one.getRate()); userMoneyService.updateMoney(1,userId,one.getRate());
UserMoneyDetails userMoneyDetails=new UserMoneyDetails();
userMoneyDetails.setUserId(userInfo.getUserId());
//查询用户当前余额 //查询用户当前余额
UserMoney userNowMoney = userMoneyService.selectUserMoneyByUserId(userInfo.getUserId()); UserMoney userNowMoney = userMoneyService.selectUserMoneyByUserId(userInfo.getUserId());
UserMoneyDetails userMoneyDetails=new UserMoneyDetails();
// userMoneyDetails.setUserId(userInfo.getUserId());
//插入余额 //插入余额
userMoneyDetails.setBalance(userNowMoney.getMoney()); userMoneyDetails.setBalance(userNowMoney.getMoney());
//插入操作类型为已操作用户余额 //插入操作类型为已操作用户余额
userMoneyDetails.setManipulateType(2); // userMoneyDetails.setManipulateType(2);
userMoneyDetails.setTitle("[退款提醒]退款："+one.getRate()); // userMoneyDetails.setTitle("[退款提醒]退款："+one.getRate());
userMoneyDetails.setContent("退款原因："+content); // userMoneyDetails.setContent("退款原因："+content);
userMoneyDetails.setType(1); // userMoneyDetails.setType(1);
userMoneyDetails.setMoney(BigDecimal.valueOf(one.getRate())); // userMoneyDetails.setMoney(BigDecimal.valueOf(one.getRate()));
userMoneyDetails.setCreateTime(sdf.format(now)); // userMoneyDetails.setCreateTime(sdf.format(now));
userMoneyDetailsService.save(userMoneyDetails); // userMoneyDetailsService.save(userMoneyDetails);
userMoneyDetails.setId(one.getUserMoneyDetailId());
userMoneyDetails.setState(3);
userMoneyDetailsService.updateById(userMoneyDetails);
cashOutService.refundSuccess(userInfo, one.getOutAt(), one.getMoney(), commonInfoService.findOne(19).getValue(),content); cashOutService.refundSuccess(userInfo, one.getOutAt(), one.getMoney(), commonInfoService.findOne(19).getValue(),content);
} }

2
src/main/java/com/sqx/modules/pay/entity/CashOut.java
View File

@ -116,7 +116,7 @@ public class CashOut implements Serializable {
private String bankCardAddress; private String bankCardAddress;
/** /**
* 银行卡开户行地址 * 费用明细表ID
*/ */
private Long userMoneyDetailId; private Long userMoneyDetailId;

6
src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java
View File

@ -317,7 +317,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
UserEntity userEntity = userService.selectUserById(userId); UserEntity userEntity = userService.selectUserById(userId);
CashOut cashOut = new CashOut(); CashOut cashOut = new CashOut();
cashOut.setClassify(classify); cashOut.setClassify(classify);
String fs = ""; String fs = "微信提现";
if(classify==1){ if(classify==1){
fs = "支付宝提现"; fs = "支付宝提现";
cashOut.setZhifubao(userEntity.getZhiFuBao()); cashOut.setZhifubao(userEntity.getZhiFuBao());
@ -356,7 +356,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
// userMoneyDetails.setBlRole(2); // userMoneyDetails.setBlRole(2);
userMoneyDetails.setBlRole(userType); userMoneyDetails.setBlRole(userType);
userMoneyDetails.setBlFlag(1); userMoneyDetails.setBlFlag(1);
userMoneyDetailsService.save(userMoneyDetails); userMoneyDetailsService.insert(userMoneyDetails);
cashOut.setUserMoneyDetailId(userMoneyDetails.getId()); cashOut.setUserMoneyDetailId(userMoneyDetails.getId());
cashOut.setState(0); cashOut.setState(0);
cashOut.setMoney(money.toString()); cashOut.setMoney(money.toString());
@ -391,7 +391,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
// userMoneyDetails.setBlRole(2); // userMoneyDetails.setBlRole(2);
userMoneyDetails.setBlRole(userType); userMoneyDetails.setBlRole(userType);
userMoneyDetails.setBlFlag(1); userMoneyDetails.setBlFlag(1);
userMoneyDetailsService.save(userMoneyDetails); userMoneyDetailsService.insert(userMoneyDetails);
cashOut.setUserMoneyDetailId(userMoneyDetails.getId()); cashOut.setUserMoneyDetailId(userMoneyDetails.getId());
cashOut.setState(0); cashOut.setState(0);
cashOut.setMoney(moneySub.toString()); cashOut.setMoney(moneySub.toString());

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

@ -19,7 +19,7 @@
</if> </if>
</select> </select>
<insert id="insert"> <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.sqx.modules.app.entity.UserMoneyDetails">
insert into user_money_details insert into user_money_details
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="null != userId "> <if test="null != userId ">