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 140ba5be..774194c2 100644 --- a/src/main/java/com/sqx/modules/pay/entity/CashOut.java +++ b/src/main/java/com/sqx/modules/pay/entity/CashOut.java @@ -128,9 +128,6 @@ public class CashOut implements Serializable { @TableField(exist = false) private String endTime; - @TableField(exist = false) - private Integer status; - @TableField(exist = false) private String sysUserName; 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 12c2b10e..fc8bdf17 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 @@ -656,7 +656,6 @@ public class CashOutServiceImpl extends ServiceImpl impleme } try { wuyouPay.checkCanCash(userId, WithdrawTypeEnum.MANUAL, new BigDecimal(money.toString())); - cashOut.setStatus(4); BaseResp baseResp = wuyouPay.extractOrder(isAlipay, outOrderNo, cashOut.getUserId(), false, cashOut.getMoney(), cashOut.getZhifubao(), cashOut.getZhifubaoName(), cashOut.getBankName(), null, null, null); if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))) { sysUserMoneyDetails.setContent("成功提现:" + money); @@ -709,16 +708,20 @@ public class CashOutServiceImpl extends ServiceImpl impleme } else { try { wuyouPay.checkCanCash(userId, WithdrawTypeEnum.MANUAL, new BigDecimal(money.toString())); - cashOut.setStatus(4); - BaseResp baseResp = wuyouPay.extractOrder(isAlipay, outOrderNo, cashOut.getUserId(), true, cashOut.getMoney(), cashOut.getZhifubao(), cashOut.getZhifubaoName(), cashOut.getBankName(), cashOut.getProvince(), cashOut.getCity(), cashOut.getBankBranch()); - if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))) { - userMoneyDetails.setContent("成功提现:" + money); - cashOut.setState(1); - cashOut.setOutAt(DateUtil.date().toString()); - } - if (baseResp.getErrorMsg() != null) { + BaseResp baseResp = wuyouPay.extractOrder(isAlipay, outOrderNo, cashOut.getUserId(), true, + cashOut.getMoney(), cashOut.getZhifubao(), cashOut.getZhifubaoName(), cashOut.getBankName(), + cashOut.getProvince(), cashOut.getCity(), cashOut.getBankBranch()); + if (baseResp.getStatus() == null || !baseResp.getStatus().equals(10000)) { return Result.error(baseResp.getErrorMsg()); } +// if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))) { +// userMoneyDetails.setContent("成功提现:" + money); +// cashOut.setState(1); +// cashOut.setOutAt(DateUtil.date().toString()); +// } +// if (baseResp.getErrorMsg() != null) { +// return Result.error(baseResp.getErrorMsg()); +// } } catch (SqxException e) { return Result.error(e.getMsg()); } catch (ValidateException v) {