diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/response/UsePageWalletAccountRecordByOperatorVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/response/UsePageWalletAccountRecordByOperatorVo.java index eed0363..fa52c6a 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/response/UsePageWalletAccountRecordByOperatorVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/response/UsePageWalletAccountRecordByOperatorVo.java @@ -19,6 +19,13 @@ public class UsePageWalletAccountRecordByOperatorVo { @JsonSerialize(using = ToStringSerializer.class) private Long associateId; + @ApiModelProperty("app标识") + @JsonSerialize(using = ToStringSerializer.class) + private Long appId; + + @ApiModelProperty("app名称") + private String appName; + @ApiModelProperty("交易类型") private TradeTypeEnum tradeType; diff --git a/dating-agency-mall-server/src/main/resources/mapper/walletaccount/PurchaseProductRecordQueryService.xml b/dating-agency-mall-server/src/main/resources/mapper/walletaccount/PurchaseProductRecordQueryService.xml index 24c5c59..17b6204 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/walletaccount/PurchaseProductRecordQueryService.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/walletaccount/PurchaseProductRecordQueryService.xml @@ -38,6 +38,8 @@ resultType="com.qniao.dam.api.query.walletaccount.user.response.UsePageWalletAccountRecordByOperatorVo"> select dawar.associate_id, + dawa.app_id, + daa.`name` as appName, dawar.trade_type, dawar.is_income, dawar.create_time, @@ -51,6 +53,7 @@ from da_wallet_account_record as dawar INNER JOIN da_wallet_account as dawa on dawar.wallet_account_id=dawa.id LEFT JOIN da_matchmaker as dam on dam.is_delete=0 and dam.user_id=dawa.user_id + LEFT JOIN da_application as daa on dawa.app_id=daa.id where dawa.is_delete=0 and dawa.identity_type=1 and dawa.app_id = #{queryParams.queryAppId}