diff --git a/mall-dao/pom.xml b/mall-dao/pom.xml
index faad13b..3256f5b 100644
--- a/mall-dao/pom.xml
+++ b/mall-dao/pom.xml
@@ -43,7 +43,13 @@
mysql-connector-java
8.0.15
-
+
+ org.projectlombok
+ lombok
+ 1.18.30
+ provided
+
+
\ No newline at end of file
diff --git a/mall-dao/src/main/java/com/buy507/mall/mapper/UmsDevelopmentFundMapper.java b/mall-dao/src/main/java/com/buy507/mall/mapper/UmsDevelopmentFundMapper.java
new file mode 100644
index 0000000..d1bddcf
--- /dev/null
+++ b/mall-dao/src/main/java/com/buy507/mall/mapper/UmsDevelopmentFundMapper.java
@@ -0,0 +1,33 @@
+package com.buy507.mall.mapper;
+
+import com.buy507.mall.model.UmsDevelopmentFund;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+
+/**
+* @author curry
+* @description 针对表【ums_development_fund(发展基金流水)】的数据库操作Mapper
+* @createDate 2025-02-17 13:41:58
+* @Entity com.buy507.mall.model.UmsDevelopmentFund
+*/
+public interface UmsDevelopmentFundMapper {
+
+ /**
+ * 查询现金总和
+ * @return
+ */
+ @Select("SELECT SUM(cash_total) FROM ums_development_fund")
+ BigDecimal getTotalCash();
+
+ /**
+ * 查询积分总和
+ * @return
+ */
+ @Select("SELECT SUM(points_total) FROM ums_development_fund")
+ Integer getTotalPoints();
+}
+
+
+
+
diff --git a/mall-dao/src/main/java/com/buy507/mall/model/UmsDevelopmentFund.java b/mall-dao/src/main/java/com/buy507/mall/model/UmsDevelopmentFund.java
new file mode 100644
index 0000000..3186e89
--- /dev/null
+++ b/mall-dao/src/main/java/com/buy507/mall/model/UmsDevelopmentFund.java
@@ -0,0 +1,48 @@
+package com.buy507.mall.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 发展基金流水
+ * @TableName ums_development_fund
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UmsDevelopmentFund implements Serializable {
+ /**
+ *
+ */
+ private Integer id;
+
+ /**
+ * 现金
+ */
+ private BigDecimal cashTotal;
+
+ /**
+ * 积分
+ */
+ private Integer pointsTotal;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedAt;
+
+ @Override
+ public String toString() {
+ return "UmsDevelopmentFund{" +
+ "id=" + id +
+ ", cashTotal=" + cashTotal +
+ ", pointsTotal=" + pointsTotal +
+ ", updatedAt=" + updatedAt +
+ '}';
+ }
+}
\ No newline at end of file
diff --git a/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsDevelopmentFundMapper.xml b/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsDevelopmentFundMapper.xml
new file mode 100644
index 0000000..0759c4b
--- /dev/null
+++ b/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsDevelopmentFundMapper.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/UmsMemberServiceImpl.java b/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/UmsMemberServiceImpl.java
index 91a49a0..e4d7541 100644
--- a/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/UmsMemberServiceImpl.java
+++ b/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/UmsMemberServiceImpl.java
@@ -128,6 +128,9 @@ public class UmsMemberServiceImpl implements UmsMemberService {
@Autowired
private RedisLock redisLock;
+
+ @Resource
+ private UmsDevelopmentFundMapper umsDevelopmentFundMapper;
@Value("${jwt.tokenHead}")
private String tokenHead;
@@ -510,7 +513,7 @@ public class UmsMemberServiceImpl implements UmsMemberService {
}
@Override
- public MemberInfoResult getMemberInfo() {
+ public MemberInfoResult getMemberInfo() {
UmsMember loginMember = getCurrentMember();
UmsMember member = memberMapper.selectByPrimaryKey(loginMember.getId());
DmsTeamTotalConsume teamTotalConsume = teamTotalConsumeMapper.selectOneByMemberId(loginMember.getId());
@@ -618,7 +621,11 @@ public class UmsMemberServiceImpl implements UmsMemberService {
if(teamLevel != null) {
result.setInviter(memberMapper.selectByPrimaryKey(teamLevel.getParentId()).getNickname());
}
-
+
+ /*查询发展基金*/
+ BigDecimal totalCash = umsDevelopmentFundMapper.getTotalCash();
+ Integer totalPoints = umsDevelopmentFundMapper.getTotalPoints();
+
return result;
}