From 36bb1f7b7d1ec18b99b886642e0efa18db29d9ba Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Mon, 3 Apr 2023 16:32:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=92=B1=E5=8C=85=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mdd/front/controller/LogsController.java   | 5 ++++-
 .../src/main/java/com/mdd/front/service/ILogsService.java    | 2 +-
 .../java/com/mdd/front/service/impl/LogsServiceImpl.java     | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/server/like-front/src/main/java/com/mdd/front/controller/LogsController.java b/server/like-front/src/main/java/com/mdd/front/controller/LogsController.java
index d06fb4fe..20f05fdb 100644
--- a/server/like-front/src/main/java/com/mdd/front/controller/LogsController.java
+++ b/server/like-front/src/main/java/com/mdd/front/controller/LogsController.java
@@ -2,6 +2,7 @@ package com.mdd.front.controller;
 
 import com.mdd.common.core.AjaxResult;
 import com.mdd.common.core.PageResult;
+import com.mdd.front.LikeFrontThreadLocal;
 import com.mdd.front.service.ILogsService;
 import com.mdd.front.validate.common.PageValidate;
 import com.mdd.front.vo.RechargeRecordVo;
@@ -28,7 +29,9 @@ public class LogsController {
     public AjaxResult<Object> userMoney(@Validated PageValidate pageValidate,
                                         @RequestParam(defaultValue = "0") Integer type) {
 
-        PageResult<RechargeRecordVo> list = iLogsService.userMoney(pageValidate, type);
+        Integer userId = LikeFrontThreadLocal.getUserId();
+
+        PageResult<RechargeRecordVo> list = iLogsService.userMoney(pageValidate, userId, type);
         return AjaxResult.success(list);
     }
 
diff --git a/server/like-front/src/main/java/com/mdd/front/service/ILogsService.java b/server/like-front/src/main/java/com/mdd/front/service/ILogsService.java
index f54d5feb..da77570d 100644
--- a/server/like-front/src/main/java/com/mdd/front/service/ILogsService.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/ILogsService.java
@@ -9,6 +9,6 @@ import com.mdd.front.vo.RechargeRecordVo;
  */
 public interface ILogsService {
 
-    PageResult<RechargeRecordVo> userMoney(PageValidate pageValidate, Integer type);
+    PageResult<RechargeRecordVo> userMoney(PageValidate pageValidate, Integer userId, Integer type);
 
 }
diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java
index 25229221..f15c480e 100644
--- a/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java
@@ -24,7 +24,7 @@ public class LogsServiceImpl implements ILogsService {
     LogMoneyMapper logMoneyMapper;
 
     @Override
-    public PageResult<RechargeRecordVo> userMoney(PageValidate pageValidate, Integer type) {
+    public PageResult<RechargeRecordVo> userMoney(PageValidate pageValidate, Integer userId, Integer type) {
         Integer pageNo   = pageValidate.getPageNo();
         Integer pageSize = pageValidate.getPageSize();
 
@@ -44,7 +44,7 @@ public class LogsServiceImpl implements ILogsService {
             vo.setAction(logMoney.getAction());
             vo.setOrderAmount(logMoney.getChangeAmount());
             vo.setTips(LogMoneyEnum.getMsgByCode(logMoney.getChangeType()));
-            vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime()));
+            vo.setCreateTime(TimeUtils.timestampToDate(logMoney.getCreateTime()));
             list.add(vo);
         }