From 2034f95ef168280b2a355c839c5fd5a505cd6f2e Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期一, 22 十二月 2025 11:24:16 +0800
Subject: [PATCH] feat:小程序端获取个人信息接口增加预估积分查询

---
 ruoyi-applet/src/main/resources/application-prod.yml                              |    1 +
 ruoyi-system/src/main/java/com/ruoyi/system/model/TCommissionTransactionFlow.java |    2 +-
 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/UserIndexController.java  |   13 ++++++++++++-
 ruoyi-applet/src/main/resources/application-test.yml                              |    1 +
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/UserIndexController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/UserIndexController.java
index 984d969..f277d35 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/UserIndexController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/UserIndexController.java
@@ -1,14 +1,17 @@
 package com.ruoyi.web.controller.api;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.system.contstant.RedisConstant;
 import com.ruoyi.system.dto.UpdatePhoneDto;
 import com.ruoyi.system.dto.UpdateUserDto;
 import com.ruoyi.system.enums.UserTypeEnum;
 import com.ruoyi.system.model.TAppUser;
+import com.ruoyi.system.model.TCommissionTransactionFlow;
 import com.ruoyi.system.service.TAppUserService;
 import com.ruoyi.system.service.TCommissionTransactionFlowService;
 import com.ruoyi.system.utils.wx.WxQrCodeUtil;
@@ -22,6 +25,9 @@
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -62,8 +68,13 @@
             } else {
                 appUser.setPromotionQrCode(cache.toString());
             }
+            //查询预估积分
+            Date now = new Date();
+            List<TCommissionTransactionFlow> list = commissionTransactionFlowService.lambdaQuery().eq(TCommissionTransactionFlow::getAppUserId, userId)
+                    .between(TCommissionTransactionFlow::getCreateTime, DateUtil.beginOfMonth(now), DateUtil.endOfMonth(now)).list();
+            Integer total = list.stream().mapToInt(TCommissionTransactionFlow::getCommissionAmount).sum();
+            appUser.setEstimatedMonthlyIntegral(total);
         }
-        //todo 查询预估积分
         return R.ok(appUser);
     }
 
diff --git a/ruoyi-applet/src/main/resources/application-prod.yml b/ruoyi-applet/src/main/resources/application-prod.yml
index 7da3f0e..6c7c771 100644
--- a/ruoyi-applet/src/main/resources/application-prod.yml
+++ b/ruoyi-applet/src/main/resources/application-prod.yml
@@ -202,6 +202,7 @@
   url:
     prefix: https://xzgt.test.591taxi.cn:${server.port}${server.servlet.context-path}
 wx:
+  url: https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={0}&secret={1}
   conf:
     appId: wx87744e4e4094a829
     secretId: c322159083d844e63dff458b5e54c4c9
diff --git a/ruoyi-applet/src/main/resources/application-test.yml b/ruoyi-applet/src/main/resources/application-test.yml
index d324b88..fcce02d 100644
--- a/ruoyi-applet/src/main/resources/application-test.yml
+++ b/ruoyi-applet/src/main/resources/application-test.yml
@@ -192,6 +192,7 @@
     accessPath: /file/
     allowExt: .jpg|.png|.gif|.jpeg|.doc|.docx|.apk|.MP4|.mp4|.pdf|.PDF|.xls|.xlsx|.rar|.zip|.rar|.m4a
 wx:
+  url: https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={0}&secret={1}
   conf:
     appId: wx87744e4e4094a829
     secretId: c322159083d844e63dff458b5e54c4c9
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCommissionTransactionFlow.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCommissionTransactionFlow.java
index 5f48c40..4cefaf3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCommissionTransactionFlow.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCommissionTransactionFlow.java
@@ -58,7 +58,7 @@
 
     @ApiModelProperty(value = "佣金收入金额")
     @TableField("commission_amount")
-    private BigDecimal commissionAmount;
+    private Integer commissionAmount;
 
     @ApiModelProperty(value = "添加时间")
     @TableField("create_time")

--
Gitblit v1.7.1