提现状态显示
This commit is contained in:
parent
6722eeafbb
commit
c6a8b49b7a
|
|
@ -128,9 +128,6 @@ public class CashOut implements Serializable {
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String endTime;
|
private String endTime;
|
||||||
|
|
||||||
@TableField(exist = false)
|
|
||||||
private Integer status;
|
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String sysUserName;
|
private String sysUserName;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -656,7 +656,6 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
wuyouPay.checkCanCash(userId, WithdrawTypeEnum.MANUAL, new BigDecimal(money.toString()));
|
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);
|
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))) {
|
if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))) {
|
||||||
sysUserMoneyDetails.setContent("成功提现:" + money);
|
sysUserMoneyDetails.setContent("成功提现:" + money);
|
||||||
|
|
@ -709,16 +708,20 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
wuyouPay.checkCanCash(userId, WithdrawTypeEnum.MANUAL, new BigDecimal(money.toString()));
|
wuyouPay.checkCanCash(userId, WithdrawTypeEnum.MANUAL, new BigDecimal(money.toString()));
|
||||||
cashOut.setStatus(4);
|
BaseResp baseResp = wuyouPay.extractOrder(isAlipay, outOrderNo, cashOut.getUserId(), true,
|
||||||
BaseResp baseResp = wuyouPay.extractOrder(isAlipay, outOrderNo, cashOut.getUserId(), true, cashOut.getMoney(), cashOut.getZhifubao(), cashOut.getZhifubaoName(), cashOut.getBankName(), cashOut.getProvince(), cashOut.getCity(), cashOut.getBankBranch());
|
cashOut.getMoney(), cashOut.getZhifubao(), cashOut.getZhifubaoName(), cashOut.getBankName(),
|
||||||
if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))) {
|
cashOut.getProvince(), cashOut.getCity(), cashOut.getBankBranch());
|
||||||
userMoneyDetails.setContent("成功提现:" + money);
|
if (baseResp.getStatus() == null || !baseResp.getStatus().equals(10000)) {
|
||||||
cashOut.setState(1);
|
|
||||||
cashOut.setOutAt(DateUtil.date().toString());
|
|
||||||
}
|
|
||||||
if (baseResp.getErrorMsg() != null) {
|
|
||||||
return Result.error(baseResp.getErrorMsg());
|
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) {
|
} catch (SqxException e) {
|
||||||
return Result.error(e.getMsg());
|
return Result.error(e.getMsg());
|
||||||
} catch (ValidateException v) {
|
} catch (ValidateException v) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue