1
phpcjl
2024-12-16 decac42c276d690ca302f21655b5ea806a85a09f
1
5个文件已修改
22 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java
@@ -9,6 +9,7 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import java.util.Collections;
import java.util.List;
/**
@@ -81,6 +82,11 @@
            public R<AppUser> getAppUserByPhone(String phone) {
                return R.fail("通过手机号查询用户失败");
            }
            @Override
            public List<AppUser> listByIds(List<String> list) {
                return Collections.emptyList();
            }
        };
    }
}
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
@@ -61,4 +61,6 @@
    @GetMapping("/app-user/getAppUserByPhone")
    R<AppUser> getAppUserByPhone(@RequestParam("phone") String phone);
    @GetMapping("/app-user/listByIds")
    List<AppUser> listByIds(List<String> list);
}
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.account.api.model.AppUser;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -145,6 +146,9 @@
    @TableField(exist = false)
    private List<Goods> goods;
    @TableField(exist = false)
    private List<AppUser> appUserList;
    public String getIdStr(){
        return String.valueOf(id);
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -480,7 +480,10 @@
    }
    @GetMapping("/listByIds")
    List<AppUser> listByIds(List<String> list){
        return appUserService.listByIds(list);
    }
}
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
@@ -76,6 +76,11 @@
            List<Goods> goods = goodsService.listByIds(Arrays.asList(forGoodIds.split(",")));
            byId.setGoods(goods);
        }
        String personIds = byId.getPersonIds();
        if (StringUtils.isNotEmpty(personIds)){
            List<AppUser> appUserList = appUserClient.listByIds(Arrays.asList(personIds.split(",")));
            byId.setAppUserList(appUserList);
        }
        return R.ok(byId);
    }