基础配置

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

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<UserGetWalletAccountRecordVo> 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);
     }
 
 }

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;
 

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<UserGetWalletAccountRecordVo> pageWalletAccountRecord(Page<Object> pageWithoutOrders,
-                                                                @Param("queryParam") UserPageWalletAccountRecordQueryParam queryParam,
-                                                                @Param("userId") Long userId);
+                                                                @Param("queryParam") UserPageWalletAccountRecordQueryParam queryParam);
 
 }

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<UserGetWalletAccountRecordVo> pageWalletAccountRecord(Long userId, UserPageWalletAccountRecordQueryParam queryParam, PageUtil pageUtil);
+    IPage<UserGetWalletAccountRecordVo> pageWalletAccountRecord(UserPageWalletAccountRecordQueryParam queryParam, PageUtil pageUtil);
 
     UserGetWalletAccountVo getWalletAccountView(Long userId);
 }

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<UserGetWalletAccountRecordVo> pageWalletAccountRecord(Long userId, UserPageWalletAccountRecordQueryParam queryParam, PageUtil pageUtil) {
-        return walletAccountViewDao.pageWalletAccountRecord(pageUtil.toPageWithoutOrders(), queryParam, userId);
+    public IPage<UserGetWalletAccountRecordVo> pageWalletAccountRecord(UserPageWalletAccountRecordQueryParam queryParam, PageUtil pageUtil) {
+        return walletAccountViewDao.pageWalletAccountRecord(pageUtil.toPageWithoutOrders(), queryParam);
     }
 
     @Override

dating-agency-mall-server/src/main/resources/mapper/walletaccount/WalletAccountViewMapper.xml

@@ -6,15 +6,15 @@
     <select id="pageWalletAccountRecord"
             resultType="com.qniao.dam.api.query.walletaccount.user.response.UserGetWalletAccountRecordVo">
         SELECT
-            dwar.id,
-            dwar.create_time,
-            dwar.wallet_account_id,
-            dwar.trade_type,
-            dwar.trade_amount,
-            dwar.is_income
+        dwar.id,
+        dwar.create_time,
+        dwar.wallet_account_id,
+        dwar.trade_type,
+        dwar.trade_amount,
+        dwar.is_income
         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 and dwa.user_id=#{userId}
+        INNER JOIN da_wallet_account as dwa on dwa.id=dwar.wallet_account_id
+        where dwa.is_delete=0 and dwa.user_id=#{queryParam.queryUserId}
         <if test="queryParam.tradeType != null">
             and dwar.trade_type = #{queryParam.tradeType}
         </if>