Compare commits
No commits in common. "4046583bcf3f2d645e2789e5ea7530b8140f6bae" and "9f20eacf11e56e9299deb7eb0161da13d7ec62b3" have entirely different histories.
4046583bcf
...
9f20eacf11
|
|
@ -124,11 +124,11 @@ public class ApiCuMemberWithdrawController extends BaseController {
|
||||||
return AjaxResult.error("会员不存在,请核对后再操作!");
|
return AjaxResult.error("会员不存在,请核对后再操作!");
|
||||||
}
|
}
|
||||||
//获取银行卡信息
|
//获取银行卡信息
|
||||||
// Long pkBank = cuMemberWithdrawParam.getPkBank();
|
Long pkBank = cuMemberWithdrawParam.getPkBank();
|
||||||
// CuMemberBankVO memberBank = iCuMemberBankService.selectCuMemberBankById(pkBank);
|
CuMemberBankVO memberBank = iCuMemberBankService.selectCuMemberBankById(pkBank);
|
||||||
// if (null == memberBank) {
|
if (null == memberBank) {
|
||||||
// return AjaxResult.error("请绑定银行卡");
|
return AjaxResult.error("请绑定银行卡");
|
||||||
// }
|
}
|
||||||
//校验支付密码
|
//校验支付密码
|
||||||
String payPwd = cuMemberLoginExt.getPayPwd();
|
String payPwd = cuMemberLoginExt.getPayPwd();
|
||||||
if (StringUtils.isEmpty(payPwd) || !SecurityUtils.matchesPassword(cuMemberWithdrawParam.getPayPwd(), payPwd)) {
|
if (StringUtils.isEmpty(payPwd) || !SecurityUtils.matchesPassword(cuMemberWithdrawParam.getPayPwd(), payPwd)) {
|
||||||
|
|
@ -241,7 +241,7 @@ public class ApiCuMemberWithdrawController extends BaseController {
|
||||||
|
|
||||||
CuMemberWithdraw cuMemberWithdraw = CuMemberWithdraw.builder().pkMember(pkMember)
|
CuMemberWithdraw cuMemberWithdraw = CuMemberWithdraw.builder().pkMember(pkMember)
|
||||||
.pkAccount(pkAccount)
|
.pkAccount(pkAccount)
|
||||||
// .pkBank(pkBank)
|
.pkBank(pkBank)
|
||||||
.remarks(cuMemberWithdrawParam.getRemarks())
|
.remarks(cuMemberWithdrawParam.getRemarks())
|
||||||
.pkRate(currencyDTO.getPkId())
|
.pkRate(currencyDTO.getPkId())
|
||||||
.cashAmount(cashAmount)
|
.cashAmount(cashAmount)
|
||||||
|
|
|
||||||
|
|
@ -55,8 +55,8 @@ public class CuMemberWithdraw extends BusinessEntity {
|
||||||
/**
|
/**
|
||||||
* 银行信息
|
* 银行信息
|
||||||
*/
|
*/
|
||||||
// @TableField("PK_BANK")
|
@TableField("PK_BANK")
|
||||||
// private Long pkBank;
|
private Long pkBank;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 汇率
|
* 汇率
|
||||||
|
|
|
||||||
|
|
@ -86,13 +86,13 @@ public class BdWaresExtend extends BaseEntity {
|
||||||
/**
|
/**
|
||||||
* 上架时间
|
* 上架时间
|
||||||
*/
|
*/
|
||||||
@TableField("PUT_ON_TIME")
|
@TableField(value = "PUT_ON_TIME", jdbcType = JdbcType.DATE, updateStrategy = FieldStrategy.IGNORED)
|
||||||
private Date putOnTime;
|
private Date putOnTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 下架时间
|
* 下架时间
|
||||||
*/
|
*/
|
||||||
@TableField("PUT_OFF_TIME")
|
@TableField(value = "PUT_OFF_TIME", jdbcType = JdbcType.DATE, updateStrategy = FieldStrategy.IGNORED)
|
||||||
private Date putOffTime;
|
private Date putOffTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -134,7 +134,7 @@ public class BdWaresExtend extends BaseEntity {
|
||||||
/**
|
/**
|
||||||
* (预计时间)到货时间
|
* (预计时间)到货时间
|
||||||
*/
|
*/
|
||||||
@TableField("ARRIVAL_TIME")
|
@TableField(value = "ARRIVAL_TIME", jdbcType = JdbcType.DATE, updateStrategy = FieldStrategy.IGNORED)
|
||||||
private Date arrivalTime;
|
private Date arrivalTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue