diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/virtualaccount/user/response/VirtualAccountRecordVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/virtualaccount/user/response/VirtualAccountRecordVo.java index 7c3719e..7b47c7c 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/virtualaccount/user/response/VirtualAccountRecordVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/virtualaccount/user/response/VirtualAccountRecordVo.java @@ -20,4 +20,7 @@ public class VirtualAccountRecordVo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; + @ApiModelProperty("备注") + private String remark; + } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/response/UserGetWalletAccountRecordVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/response/UserGetWalletAccountRecordVo.java index 903433a..b297e4e 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/response/UserGetWalletAccountRecordVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/response/UserGetWalletAccountRecordVo.java @@ -34,4 +34,7 @@ public class UserGetWalletAccountRecordVo { @ApiModelProperty("是否收入") private Boolean isIncome; + @ApiModelProperty("备注") + private String remark; + } diff --git a/dating-agency-mall-server/src/main/resources/mapper/virtualaccount/VirtualAccountRecordDao.xml b/dating-agency-mall-server/src/main/resources/mapper/virtualaccount/VirtualAccountRecordDao.xml index d2d1778..6b87cbf 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/virtualaccount/VirtualAccountRecordDao.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/virtualaccount/VirtualAccountRecordDao.xml @@ -6,7 +6,8 @@ SELECT davar.trade_type, davar.trade_balance, - davar.create_time + davar.create_time, + davar.remark from da_virtual_account as dava LEFT JOIN da_virtual_account_record as davar on davar.virtual_account_id=dava.id WHERE dava.is_delete=0 diff --git a/dating-agency-mall-server/src/main/resources/mapper/walletaccount/WalletAccountViewMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/walletaccount/WalletAccountViewMapper.xml index 5346c0f..b7cc2a7 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/walletaccount/WalletAccountViewMapper.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/walletaccount/WalletAccountViewMapper.xml @@ -11,7 +11,8 @@ dwar.wallet_account_id, dwar.trade_type, dwar.trade_amount, - dwar.is_income + dwar.is_income, + dwar.remark FROM da_wallet_account_record as dwar INNER JOIN da_wallet_account as dwa on dwa.id=dwar.wallet_account_id where dwa.is_delete=0