合并代码

puzhibing

2024-12-16 8ae95d6609b1eff69115463fca25659512a158ae

合并代码

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java

@@ -84,7 +84,8 @@
            }

            @Override
            public List<AppUser> listByIds(List<String> list) {
            public List<AppUser> listByIds(List<Long> list) {
                log.error("获取用户失败: "+cause.getMessage());
                return Collections.emptyList();
            }
        };

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java

@@ -62,5 +62,5 @@
    R<AppUser> getAppUserByPhone(@RequestParam("phone") String phone);

    @GetMapping("/app-user/listByIds")
    List<AppUser> listByIds(List<String> list);
    List<AppUser> listByIds(@RequestParam("ids") List<Long> list);
}

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

@@ -72,7 +72,6 @@

    @ApiModelProperty(value = "添加时间")
    @TableField("create_time")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "删除（0=否，1=是）")

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java

@@ -481,8 +481,9 @@


    @GetMapping("/listByIds")
    List<AppUser> listByIds(List<String> list){
        return appUserService.listByIds(list);
    List<AppUser> listByIds(@RequestParam("ids") List<Long> ids){
        List<AppUser> appUsers = appUserService.listByIds(ids);
        return appUsers;
    }

}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java

@@ -26,10 +26,12 @@

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.stream.Collectors;

/**
 * <p>
@@ -80,7 +82,8 @@
        }
        String personIds = byId.getPersonIds();
        if (StringUtils.isNotEmpty(personIds)){
            List<AppUser> appUserList = appUserClient.listByIds(Arrays.asList(personIds.split(",")));
            List<Long> ids = Arrays.stream(personIds.split(",")).map(Long::valueOf).collect(Collectors.toList());
            List<AppUser> appUserList = appUserClient.listByIds(ids);
            byId.setAppUserList(appUserList);
        }