From 12c61d09f1e44b5786a33ac879a4b23f5558b473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Tue, 13 Aug 2024 10:49:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/controller/CashController.java | 34 ++++++++++++------- .../com/sqx/modules/pay/entity/CashOut.java | 2 +- .../pay/service/impl/CashOutServiceImpl.java | 6 ++-- .../mapper/app/UserMoneyDetailsDao.xml | 2 +- 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/sqx/modules/pay/controller/CashController.java b/src/main/java/com/sqx/modules/pay/controller/CashController.java index 2bbdecb..0204c5c 100644 --- a/src/main/java/com/sqx/modules/pay/controller/CashController.java +++ b/src/main/java/com/sqx/modules/pay/controller/CashController.java @@ -360,7 +360,7 @@ public class CashController { cashOutService.update(one); UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); - userMoneyDetails.setUserId(one.getUserMoneyDetailId()); + userMoneyDetails.setId(one.getUserMoneyDetailId()); userMoneyDetails.setState(2); userMoneyDetailsService.updateById(userMoneyDetails); @@ -403,6 +403,12 @@ public class CashController { one.setOutAt(sdf.format(new Date())); //更新转账订单 cashOutService.update(one); + + UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); + userMoneyDetails.setId(one.getUserMoneyDetailId()); + userMoneyDetails.setState(2); + userMoneyDetailsService.updateById(userMoneyDetails); + //查询用户 UserEntity userInfo=userService.queryByUserId(one.getUserId()); cashOutService.cashOutSuccess(userInfo, one.getOutAt(), one.getMoney(), one.getZhifubao(), commonInfoService.findOne(19).getValue()); @@ -425,7 +431,7 @@ public class CashController { cashOutService.update(one); UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); - userMoneyDetails.setUserId(one.getUserMoneyDetailId()); + userMoneyDetails.setId(one.getUserMoneyDetailId()); userMoneyDetails.setState(2); userMoneyDetailsService.updateById(userMoneyDetails); @@ -469,7 +475,7 @@ public class CashController { cashOutService.update(one); UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); - userMoneyDetails.setUserId(one.getUserMoneyDetailId()); + userMoneyDetails.setId(one.getUserMoneyDetailId()); userMoneyDetails.setState(2); userMoneyDetailsService.updateById(userMoneyDetails); @@ -505,21 +511,23 @@ public class CashController { if(userInfo!=null){ //将金额退还 userMoneyService.updateMoney(1,userId,one.getRate()); - UserMoneyDetails userMoneyDetails=new UserMoneyDetails(); - userMoneyDetails.setUserId(userInfo.getUserId()); //查询用户当前余额 UserMoney userNowMoney = userMoneyService.selectUserMoneyByUserId(userInfo.getUserId()); + UserMoneyDetails userMoneyDetails=new UserMoneyDetails(); +// userMoneyDetails.setUserId(userInfo.getUserId()); //插入余额 userMoneyDetails.setBalance(userNowMoney.getMoney()); //插入操作类型为已操作用户余额 - userMoneyDetails.setManipulateType(2); - userMoneyDetails.setTitle("[退款提醒]退款："+one.getRate()); - userMoneyDetails.setContent("退款原因："+content); - userMoneyDetails.setType(1); - userMoneyDetails.setMoney(BigDecimal.valueOf(one.getRate())); - userMoneyDetails.setCreateTime(sdf.format(now)); - userMoneyDetailsService.save(userMoneyDetails); - +// userMoneyDetails.setManipulateType(2); +// userMoneyDetails.setTitle("[退款提醒]退款："+one.getRate()); +// userMoneyDetails.setContent("退款原因："+content); +// userMoneyDetails.setType(1); +// userMoneyDetails.setMoney(BigDecimal.valueOf(one.getRate())); +// userMoneyDetails.setCreateTime(sdf.format(now)); +// 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); } diff --git a/src/main/java/com/sqx/modules/pay/entity/CashOut.java b/src/main/java/com/sqx/modules/pay/entity/CashOut.java index d864fd5..6dac39f 100644 --- a/src/main/java/com/sqx/modules/pay/entity/CashOut.java +++ b/src/main/java/com/sqx/modules/pay/entity/CashOut.java @@ -116,7 +116,7 @@ public class CashOut implements Serializable { private String bankCardAddress; /** - * 银行卡开户行地址 + * 费用明细表ID */ private Long userMoneyDetailId; diff --git a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java index 8796a32..f675b6f 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java @@ -317,7 +317,7 @@ public class CashOutServiceImpl extends ServiceImpl impleme UserEntity userEntity = userService.selectUserById(userId); CashOut cashOut = new CashOut(); cashOut.setClassify(classify); - String fs = ""; + String fs = "微信提现"; if(classify==1){ fs = "支付宝提现"; cashOut.setZhifubao(userEntity.getZhiFuBao()); @@ -356,7 +356,7 @@ public class CashOutServiceImpl extends ServiceImpl impleme // userMoneyDetails.setBlRole(2); userMoneyDetails.setBlRole(userType); userMoneyDetails.setBlFlag(1); - userMoneyDetailsService.save(userMoneyDetails); + userMoneyDetailsService.insert(userMoneyDetails); cashOut.setUserMoneyDetailId(userMoneyDetails.getId()); cashOut.setState(0); cashOut.setMoney(money.toString()); @@ -391,7 +391,7 @@ public class CashOutServiceImpl extends ServiceImpl impleme // userMoneyDetails.setBlRole(2); userMoneyDetails.setBlRole(userType); userMoneyDetails.setBlFlag(1); - userMoneyDetailsService.save(userMoneyDetails); + userMoneyDetailsService.insert(userMoneyDetails); cashOut.setUserMoneyDetailId(userMoneyDetails.getId()); cashOut.setState(0); cashOut.setMoney(moneySub.toString()); diff --git a/src/main/resources/mapper/app/UserMoneyDetailsDao.xml b/src/main/resources/mapper/app/UserMoneyDetailsDao.xml index 192a794..525e041 100644 --- a/src/main/resources/mapper/app/UserMoneyDetailsDao.xml +++ b/src/main/resources/mapper/app/UserMoneyDetailsDao.xml @@ -19,7 +19,7 @@ - + insert into user_money_details