admin 充值记录

admin/src/main/java/com/kym/admin/controller/CustomController.java

@@ -5,8 +5,10 @@ import com.kym.common.annotation.SysLog;
 import com.kym.entity.admin.queryParams.CommonQueryParam;
 import com.kym.entity.admin.queryParams.CustomChargeOrdersQueryParam;
 import com.kym.service.miniapp.ChargeOrderService;
+import com.kym.service.miniapp.PayLogService;
 import com.kym.service.miniapp.UserService;
 import com.kym.service.miniapp.WalletDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -22,11 +24,13 @@ public class CustomController {
     private final UserService customUserService;
     private final ChargeOrderService customChargeOrders;
     private final WalletDetailService customWalletDetailService;
+    private final PayLogService payLogService;
 
-    public CustomController(UserService customUserService, ChargeOrderService customChargeOrders, WalletDetailService customWalletDetailService) {
+    public CustomController(UserService customUserService, ChargeOrderService customChargeOrders, WalletDetailService customWalletDetailService, PayLogService payLogService) {
         this.customUserService = customUserService;
         this.customChargeOrders = customChargeOrders;
         this.customWalletDetailService = customWalletDetailService;
+        this.payLogService = payLogService;
     }
 
     // TODO: 2023-08-18 用户信息列表（基本信息，余额）
@@ -56,10 +60,10 @@ public class CustomController {
 
     @SysLog("充值记录列表")
     @GetMapping("/listRecharge")
-    public R listRecharge(CommonQueryParam params,
+    public R listRecharge(@ModelAttribute CommonQueryParam params,
                           @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
-        return R.success(customWalletDetailService.listRecharge(params, pageNum, pageSize));
+        return R.success(payLogService.listRecharge(params, pageNum, pageSize));
     }
 
 

entity/src/main/java/com/kym/entity/admin/queryParams/CommonQueryParam.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 /**
  * @author skyline
- * @description 用户查询参数
+ * @description 查询参数
  * @date 2023-08-22 18:56
  */
 @Data
@@ -18,9 +18,11 @@ public class CommonQueryParam {
      */
     private String username;
     /**
-     * 车牌号
+     * 类型
      */
-    //private String plateNo;
-
-
+    private Integer type;
+    /**
+     * 状态
+     */
+    private Integer status;
 }

entity/src/main/java/com/kym/entity/admin/vo/CustomRechargeVo.java

@@ -0,0 +1,25 @@
+package com.kym.entity.admin.vo;
+
+import com.alibaba.fastjson2.util.DateUtils;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author skyline
+ * @description
+ * @date 2023-08-30 17:02
+ */
+@Data
+public class CustomRechargeVo {
+    private final String rechargeType = "微信";
+    private Long userId;
+    private String mobilePhone;
+    private String rechargeAmount;
+    private String currency;
+    private String outTradeNo;
+    private String transactionId;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String transactionTime;
+}

mapper/src/main/java/com/kym/mapper/miniapp/PayLogMapper.java

@@ -1,7 +1,12 @@
 package com.kym.mapper.miniapp;
 
+import com.kym.entity.admin.queryParams.CommonQueryParam;
+import com.kym.entity.admin.vo.CustomRechargeVo;
 import com.kym.entity.miniapp.PayLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +17,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2023-08-12
  */
 public interface PayLogMapper extends BaseMapper<PayLog> {
+    List<CustomRechargeVo> listRecharge(@Param("params") CommonQueryParam params);
 
 }

mapper/src/main/resources/mappers/miniapp/PayLogMapper.xml

@@ -4,28 +4,58 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.PayLog">
-        <id column="id" property="id" />
-        <result column="user_id" property="userId" />
-        <result column="openid" property="openid" />
-        <result column="bank_type" property="bankType" />
-        <result column="mch_id" property="mchId" />
-        <result column="out_trade_no" property="outTradeNo" />
-        <result column="transaction_id" property="transactionId" />
-        <result column="success_time" property="successTime" />
-        <result column="trade_type" property="tradeType" />
-        <result column="trade_state" property="tradeState" />
-        <result column="attach" property="attach" />
-        <result column="total" property="total" />
-        <result column="currency" property="currency" />
-        <result column="payer_total" property="payerTotal" />
-        <result column="payer_currency" property="payerCurrency" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
+        <id column="id" property="id"/>
+        <result column="user_id" property="userId"/>
+        <result column="openid" property="openid"/>
+        <result column="bank_type" property="bankType"/>
+        <result column="mch_id" property="mchId"/>
+        <result column="out_trade_no" property="outTradeNo"/>
+        <result column="transaction_id" property="transactionId"/>
+        <result column="success_time" property="successTime"/>
+        <result column="trade_type" property="tradeType"/>
+        <result column="trade_state" property="tradeState"/>
+        <result column="attach" property="attach"/>
+        <result column="total" property="total"/>
+        <result column="currency" property="currency"/>
+        <result column="payer_total" property="payerTotal"/>
+        <result column="payer_currency" property="payerCurrency"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
     </resultMap>
 
+    <resultMap id="CustomRechargeMap" type="com.kym.entity.admin.vo.CustomRechargeVo">
+        <result column="user_id" property="userId"/>
+        <result column="mobile_phone" property="mobilePhone"/>
+        <result column="recharge_amount" property="rechargeAmount"/>
+        <result column="currency" property="currency"/>
+        <result column="out_trade_no" property="outTradeNo"/>
+        <result column="transaction_id" property="transactionId"/>
+        <result column="transaction_time" property="transactionTime"/>
+    </resultMap>
+
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, user_id, openid, bank_type, mch_id, out_trade_no, transaction_id, success_time, trade_type, trade_state, attach, total, currency, payer_total, payer_currency, create_time, update_time
     </sql>
 
+    <select id="listRecharge" parameterType="com.kym.entity.admin.queryParams.CommonQueryParam"
+            resultMap="CustomRechargeMap">
+        SELECT
+        t1.user_id,
+        t2.`mobile_phone`,
+        t1.total AS rechargeAmount,
+        t1.currency,
+        t1.out_trade_no,
+        t1.transaction_id,
+        CONVERT(t1.success_time,DATETIME) AS transaction_time
+        FROM
+        t_pay_log t1
+        LEFT JOIN t_user t2
+        ON t1.`user_id` = t2.`id`
+        <if test="params.mobilePhone != null">
+            where t2.mobile_phone = ${params.mobilePhone}
+        </if>
+    </select>
+
 </mapper>

mapper/src/main/resources/mappers/miniapp/WalletDetailMapper.xml

@@ -4,24 +4,27 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.WalletDetail">
-        <id column="id" property="id" />
-        <result column="user_id" property="userId" />
-        <result column="type" property="type" />
-        <result column="current" property="current" />
-        <result column="order_no" property="orderNo" />
-        <result column="amount" property="amount" />
-        <result column="commission" property="commission" />
-        <result column="transaction_id" property="transactionId" />
-        <result column="transaction_time" property="transactionTime" />
-        <result column="status" property="status" />
-        <result column="remark" property="remark" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
+        <id column="id" property="id"/>
+        <result column="user_id" property="userId"/>
+        <result column="type" property="type"/>
+        <result column="current" property="current"/>
+        <result column="order_no" property="orderNo"/>
+        <result column="amount" property="amount"/>
+        <result column="commission" property="commission"/>
+        <result column="transaction_id" property="transactionId"/>
+        <result column="transaction_time" property="transactionTime"/>
+        <result column="status" property="status"/>
+        <result column="remark" property="remark"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, type, current, order_no, amount, commission, transaction_id, transaction_time, status, remark, create_time, update_time
+        id, user_id, type, currency, order_no, amount, commission, transaction_id, transaction_time, status, remark, create_time, update_time
     </sql>
 
+
+
 </mapper>

service/src/main/java/com/kym/service/miniapp/PayLogService.java

@@ -1,7 +1,10 @@
 package com.kym.service.miniapp;
 
-import com.kym.entity.miniapp.PayLog;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.kym.entity.admin.queryParams.CommonQueryParam;
+import com.kym.entity.admin.vo.CustomRechargeVo;
+import com.kym.entity.common.PageBean;
+import com.kym.entity.miniapp.PayLog;
 
 /**
  * <p>
@@ -13,4 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface PayLogService extends IService<PayLog> {
 
+    PageBean<CustomRechargeVo> listRecharge(CommonQueryParam params, Integer pageNum, Integer pageSize);
+
 }

service/src/main/java/com/kym/service/miniapp/WalletDetailService.java

@@ -20,5 +20,4 @@ public interface WalletDetailService extends IService<WalletDetail> {
 
     List<WalletDetail> listWalletDetail(int type);
 
-    Object listRecharge(CommonQueryParam params, Integer pageNum, Integer pageSize);
 }

service/src/main/java/com/kym/service/miniapp/impl/PayLogServiceImpl.java

@@ -1,12 +1,18 @@
 package com.kym.service.miniapp.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.kym.entity.admin.queryParams.CommonQueryParam;
+import com.kym.entity.admin.vo.CustomRechargeVo;
+import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.PayLog;
 import com.kym.mapper.miniapp.PayLogMapper;
 import com.kym.service.miniapp.PayLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 支付日志 服务实现类
@@ -18,5 +24,12 @@ import org.springframework.stereotype.Service;
 @Service
 @DS("db-miniapp")
 public class PayLogServiceImpl extends ServiceImpl<PayLogMapper, PayLog> implements PayLogService {
+    @Override
+    public PageBean<CustomRechargeVo> listRecharge(CommonQueryParam params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //  充值记录（交易单号，用户，充值金额，充值方式，第三方充值编号，充值时间）
+        List<CustomRechargeVo> list = baseMapper.listRecharge(params);
+        return new PageBean<>(list);
+    }
 
 }

service/src/main/java/com/kym/service/miniapp/impl/WalletDetailServiceImpl.java

@@ -3,8 +3,6 @@ package com.kym.service.miniapp.impl;
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageHelper;
-import com.kym.entity.admin.queryParams.CommonQueryParam;
 import com.kym.entity.miniapp.WalletDetail;
 import com.kym.mapper.miniapp.WalletDetailMapper;
 import com.kym.service.miniapp.WalletDetailService;
@@ -42,11 +40,4 @@ public class WalletDetailServiceImpl extends ServiceImpl<WalletDetailMapper, Wal
 
     }
 
-    @Override
-    public Object listRecharge(CommonQueryParam params, Integer pageNum, Integer pageSize) {
-        PageHelper.startPage(pageNum,pageSize);
-        // TODO: 2023-08-22 充值记录（交易单号，用户，充值金额，充值方式，第三方充值编号，充值时间） 
-        return null;
-    }
-
 }