1

phpcjl

2024-12-16 d0a4f1260ae71837c125a9f2c4609e6fbf0c5ee1

1

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java

@@ -265,6 +265,11 @@
    private LocalDateTime lastOrderTime;


    public String getIdStr(){
        return String.valueOf(id);
    }




}

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java

@@ -141,4 +141,8 @@
    @ApiModelProperty(value = "其他商品名称")
    @TableField(exist = false)
    private List<String> goodsNameList;

    public String getIdStr(){
        return String.valueOf(id);
    }
}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java

@@ -164,20 +164,20 @@
    @Override
    public UserPointStatistics getStatistics(UserPoint userPoint) {

        List<Long> userIds = new ArrayList<>();
        if (StringUtils.isNotEmpty(userPoint.getUserName())) {
            userIds = appUserService.listObjs(new LambdaQueryWrapper<AppUser>()
        if (StringUtils.isNotEmpty(userPoint.getUserName()) || StringUtils.isNotEmpty(userPoint.getPhone())) {
            List<Long> userIds = appUserService.listObjs(new LambdaQueryWrapper<AppUser>()
                            .select(AppUser::getId)
                            .like(AppUser::getName, userPoint.getUserName()))
                            .like(StringUtils.isNotEmpty(userPoint.getUserName()),AppUser::getName, userPoint.getUserName())
                            .like(StringUtils.isNotEmpty(userPoint.getPhone()),AppUser::getPhone, userPoint.getPhone()))
                    .stream()
                    .map(appUserId -> (Long) appUserId)
                    .collect(Collectors.toList());
            userPoint.setUserIds(userIds);
        }

        List<UserPoint> userPointList = userPointMapper.findLatestChangeByType(userPoint);
        Map<Integer, Integer> userBalanceMap = userPointList.stream()
                .collect(Collectors.toMap(UserPoint::getType, UserPoint::getBalance));



        Integer consumePoint = Optional.ofNullable(userBalanceMap.get(PointChangeType.CONSUME.getCode())).orElse(0);

 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserPointMapper.xml

@@ -58,7 +58,10 @@
                             AND type = #{type}
                         </if>
                         <if test="userIds != null and userIds.size !=0">
                             AND app_user_id = #{appUserId}
                             AND app_user_id IN
                             <foreach item="item" collection="userIds" separator="," open="(" close=")" index="">
                                 #{item}
                             </foreach>
                         </if>
                 </where>
        ) AS subquery

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopPointServiceImpl.java

@@ -20,6 +20,7 @@

    @Override
    public ShopPointStatistics statistics() {
        ShopPointStatistics shopPointStatistics = new ShopPointStatistics();
        return null;
    }
}