diff --git a/src/main/java/com/peanut/modules/book/controller/MyUserController.java b/src/main/java/com/peanut/modules/book/controller/MyUserController.java index 2d0a8037..9e5c4dee 100644 --- a/src/main/java/com/peanut/modules/book/controller/MyUserController.java +++ b/src/main/java/com/peanut/modules/book/controller/MyUserController.java @@ -18,6 +18,7 @@ import com.peanut.common.utils.MailUtil; import com.peanut.modules.book.service.*; import com.peanut.modules.book.to.PageIdDto; import com.peanut.modules.common.entity.*; +import com.peanut.modules.common.service.UserContributionService; import com.peanut.modules.common.service.UserInviteRegisterService; import com.peanut.modules.common.service.UserVipService; import com.peanut.modules.sys.service.SysUserTokenService; @@ -57,6 +58,8 @@ public class MyUserController { private UserInviteRegisterService inviteRegisterService; @Autowired private UserVipService userVipService; + @Autowired + private UserContributionService userContributionService; /** * 列表 @@ -103,6 +106,12 @@ public class MyUserController { for (MyUserEntity myUserEntity : myUserEntityPage.getRecords()) { myUserEntity.setUserVips(userVipService.list(new LambdaQueryWrapper() .eq(UserVip::getUserId,myUserEntity.getId()).eq(UserVip::getState,0))); + Map map = userContributionService.getMap(new MPJLambdaWrapper() + .selectSum(UserContribution::getScore).eq(UserContribution::getUserId,myUserEntity.getId())); + myUserEntity.setContributionScore(0+""); + if (map!=null&&map.containsKey("score")){ + myUserEntity.setContributionScore(map.get("score").toString()); + } } return R.ok().put("user",myUserEntityPage); } diff --git a/src/main/java/com/peanut/modules/common/controller/UserContributionController.java b/src/main/java/com/peanut/modules/common/controller/UserContributionController.java index 3fcf4af4..c9cb6382 100644 --- a/src/main/java/com/peanut/modules/common/controller/UserContributionController.java +++ b/src/main/java/com/peanut/modules/common/controller/UserContributionController.java @@ -41,7 +41,7 @@ public class UserContributionController { totalWrapper.eq("user_id",userId); totalWrapper.select("sum(score) as score"); Map map = contributionService.getMap(totalWrapper); - return R.ok().put("list",contributions).put("total",map.get("score")); + return R.ok().put("list",contributions).put("total",map==null?0:map.get("score")); } //分类下湖分明细 diff --git a/src/main/java/com/peanut/modules/common/entity/MyUserEntity.java b/src/main/java/com/peanut/modules/common/entity/MyUserEntity.java index e9d00d53..cd6b669e 100644 --- a/src/main/java/com/peanut/modules/common/entity/MyUserEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/MyUserEntity.java @@ -156,5 +156,7 @@ public class MyUserEntity implements Serializable { @TableField(exist = false) private List userVips; + @TableField(exist = false) + private String contributionScore; } diff --git a/src/main/java/com/peanut/modules/common/entity/UserContribution.java b/src/main/java/com/peanut/modules/common/entity/UserContribution.java index dee2e100..b346c1b6 100644 --- a/src/main/java/com/peanut/modules/common/entity/UserContribution.java +++ b/src/main/java/com/peanut/modules/common/entity/UserContribution.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; + +import java.math.BigDecimal; import java.util.Date; @Data @@ -17,7 +19,7 @@ public class UserContribution { private Integer userId; //分数 - private Double score; + private BigDecimal score; //明细 private String detail; diff --git a/src/main/java/com/peanut/modules/common/entity/UserContributionExchange.java b/src/main/java/com/peanut/modules/common/entity/UserContributionExchange.java index 407671f2..064cd597 100644 --- a/src/main/java/com/peanut/modules/common/entity/UserContributionExchange.java +++ b/src/main/java/com/peanut/modules/common/entity/UserContributionExchange.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; + +import java.math.BigDecimal; import java.util.Date; @Data @@ -17,7 +19,7 @@ public class UserContributionExchange { private Integer userId; //剩余未换分数 - private Double surplus; + private BigDecimal surplus; private Date createTime; diff --git a/src/main/java/com/peanut/modules/common/service/impl/UserInviteRegisterServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/UserInviteRegisterServiceImpl.java index b0e3b199..7a645361 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/UserInviteRegisterServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/UserInviteRegisterServiceImpl.java @@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; import java.util.Random; @@ -35,7 +36,7 @@ public class UserInviteRegisterServiceImpl extends ServiceImpl