diff --git a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/paymentorder/constant/PaymentMethodEnum.java b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/paymentorder/constant/PaymentMethodEnum.java index 521bdc6..dcb4ead 100644 --- a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/paymentorder/constant/PaymentMethodEnum.java +++ b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/paymentorder/constant/PaymentMethodEnum.java @@ -10,7 +10,9 @@ import lombok.Getter; @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PaymentMethodEnum { - WECHAT_PAY(1, "微信付款"); + WECHAT_PAY(1, "微信付款JSAPI"), + WECHAT_PAY_H5(2, "微信付款H5"); + @EnumValue @JsonValue diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/WalletAccountUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/WalletAccountUserQueryController.java index f3ec079..594380b 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/WalletAccountUserQueryController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/WalletAccountUserQueryController.java @@ -34,7 +34,10 @@ public class WalletAccountUserQueryController { public QnPage userPageWalletAccountRecord(@RequestParam("userId") Long userId, PageUtil pageUtil, UserPageWalletAccountRecordQueryParam queryParam) { - return PageUtil.convert(walletAccountQueryService.pageWalletAccountRecord(userId, queryParam, pageUtil), UserGetWalletAccountRecordVo.class); + if (Objects.isNull(queryParam.getQueryUserId())){ + queryParam.setQueryUserId(userId); + } + return PageUtil.convert(walletAccountQueryService.pageWalletAccountRecord(queryParam, pageUtil), UserGetWalletAccountRecordVo.class); } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/request/UserPageWalletAccountRecordQueryParam.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/request/UserPageWalletAccountRecordQueryParam.java index 1327aee..cd59a99 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/request/UserPageWalletAccountRecordQueryParam.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/request/UserPageWalletAccountRecordQueryParam.java @@ -9,6 +9,8 @@ import java.time.LocalDateTime; @Data public class UserPageWalletAccountRecordQueryParam { + private Long queryUserId; + @ApiModelProperty("交易收益类型:101认证 102发布 103匹配 104推荐 202提现") private Integer tradeType; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/WalletAccountViewDao.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/WalletAccountViewDao.java index 5389ee5..3eef9f0 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/WalletAccountViewDao.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/WalletAccountViewDao.java @@ -12,7 +12,6 @@ import java.util.List; @Mapper public interface WalletAccountViewDao { IPage pageWalletAccountRecord(Page pageWithoutOrders, - @Param("queryParam") UserPageWalletAccountRecordQueryParam queryParam, - @Param("userId") Long userId); + @Param("queryParam") UserPageWalletAccountRecordQueryParam queryParam); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/walletaccount/WalletAccountQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/walletaccount/WalletAccountQueryService.java index bbb8745..7bf74a1 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/walletaccount/WalletAccountQueryService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/walletaccount/WalletAccountQueryService.java @@ -11,7 +11,7 @@ import com.qniao.framework.utils.PageUtil; public interface WalletAccountQueryService { WalletAccount queryByUserId(Long userId); - IPage pageWalletAccountRecord(Long userId, UserPageWalletAccountRecordQueryParam queryParam, PageUtil pageUtil); + IPage pageWalletAccountRecord(UserPageWalletAccountRecordQueryParam queryParam, PageUtil pageUtil); UserGetWalletAccountVo getWalletAccountView(Long userId); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/walletaccount/impl/WalletAccountQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/walletaccount/impl/WalletAccountQueryServiceImpl.java index ad2ffeb..2a37f0e 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/walletaccount/impl/WalletAccountQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/walletaccount/impl/WalletAccountQueryServiceImpl.java @@ -38,8 +38,8 @@ public class WalletAccountQueryServiceImpl implements WalletAccountQueryService } @Override - public IPage pageWalletAccountRecord(Long userId, UserPageWalletAccountRecordQueryParam queryParam, PageUtil pageUtil) { - return walletAccountViewDao.pageWalletAccountRecord(pageUtil.toPageWithoutOrders(), queryParam, userId); + public IPage pageWalletAccountRecord(UserPageWalletAccountRecordQueryParam queryParam, PageUtil pageUtil) { + return walletAccountViewDao.pageWalletAccountRecord(pageUtil.toPageWithoutOrders(), queryParam); } @Override 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 a45d4c4..83cb9c1 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 @@ -6,15 +6,15 @@