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 939b76c..8796a32 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,10 +317,13 @@ public class CashOutServiceImpl extends ServiceImpl impleme UserEntity userEntity = userService.selectUserById(userId); CashOut cashOut = new CashOut(); cashOut.setClassify(classify); + String fs = ""; if(classify==1){ + fs = "支付宝提现"; cashOut.setZhifubao(userEntity.getZhiFuBao()); cashOut.setZhifubaoName(userEntity.getZhiFuBaoName()); }else{ + fs = "银行卡提现"; cashOut.setBankCard(userEntity.getBankCard()); cashOut.setBankCardName(userEntity.getBankCardName()); cashOut.setBankCardUserName(userEntity.getBankCardUserName()); @@ -344,13 +347,14 @@ public class CashOutServiceImpl extends ServiceImpl impleme userMoneyDetails.setUserId(userId); userMoneyDetails.setClassify(3); userMoneyDetails.setTitle("提现:" + money); - userMoneyDetails.setContent("支付宝提现:" + money + ",手续费:" + mul ); + userMoneyDetails.setContent(fs+":" + money + ",手续费:" + mul ); userMoneyDetails.setType(2); userMoneyDetails.setState(1); userMoneyDetails.setMoney(new BigDecimal(moneySum)); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); userMoneyDetails.setCreateTime(sdf.format(new Date())); - userMoneyDetails.setBlRole(2); +// userMoneyDetails.setBlRole(2); + userMoneyDetails.setBlRole(userType); userMoneyDetails.setBlFlag(1); userMoneyDetailsService.save(userMoneyDetails); cashOut.setUserMoneyDetailId(userMoneyDetails.getId()); @@ -378,13 +382,14 @@ public class CashOutServiceImpl extends ServiceImpl impleme userMoneyDetails.setUserId(userId); userMoneyDetails.setClassify(3); userMoneyDetails.setTitle("提现:" + moneySub); - userMoneyDetails.setContent("支付宝提现:" + moneySub + ",手续费:" + mul ); + userMoneyDetails.setContent(fs+":" + moneySub + ",手续费:" + mul ); userMoneyDetails.setType(2); userMoneyDetails.setState(1); userMoneyDetails.setMoney(new BigDecimal(money)); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); userMoneyDetails.setCreateTime(sdf.format(new Date())); - userMoneyDetails.setBlRole(2); +// userMoneyDetails.setBlRole(2); + userMoneyDetails.setBlRole(userType); userMoneyDetails.setBlFlag(1); userMoneyDetailsService.save(userMoneyDetails); cashOut.setUserMoneyDetailId(userMoneyDetails.getId());