处理冲突

Pu Zhibing

2024-12-16 c3707eea026757745ab278757e5918f0ebf47d9a

处理冲突

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

@@ -78,6 +78,11 @@
                return R.fail("根据用户名称模糊搜索用户列表失败：" + cause.getMessage());
            }
            
            @Override
            public R<List<AppUser>> getAppUserByPhone(String phone) {
                return R.fail("根据用户电话模糊搜索用户列表失败：" + cause.getMessage());
            }
			

            @Override
            public R<Void> addAppUserShop(AppUserShop appUserShop) {
@@ -85,7 +90,7 @@
            }

            @Override
            public R<AppUser> getAppUserByPhone(String phone) {
            public R<AppUser> getAppUserByPhone1(String phone) {
                return R.fail("通过手机号查询用户失败");
            }


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

@@ -77,4 +77,8 @@
     */
    @PostMapping("/app-user/getAppUserByPhone")
    R<List<AppUser>> getAppUserByPhone(@RequestParam("phone") String phone);
	
	
    @PostMapping("/app-user/getAppUserByPhone1")
    R<AppUser> getAppUserByPhone1(String phone);
}

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

@@ -519,6 +519,15 @@
    List<AppUser> listByIds(List<String> list){
        return appUserService.listByIds(list);
    }
	
	
	
    @PostMapping("/getAppUserByPhone1")
    public R<AppUser> getAppUserByPhone1(@RequestParam("phone") String phone){
        AppUser appUser = appUserService.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1)
                .eq(AppUser::getPhone, phone));
        return R.ok(appUser);
    }

}


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

@@ -180,7 +180,7 @@
                    GoodsCategory goodsCategory = goodsCategoryService.getById(g.getGoodsCategoryId());
                    Integer shopId = goodsBargainPrice.getShopId();
                    Shop shop = shopService.getById(shopId);
                    R<AppUser> r = appUserClient.getAppUserByPhone(shop.getPhone());
                    R<AppUser> r = appUserClient.getAppUserByPhone1(shop.getPhone());
                    if (R.isError(r)){
                        throw new RuntimeException("获取店长信息失败");
                    }

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

@@ -101,7 +101,7 @@

    @Override
    public Boolean cheUserByPhone(String phone) {
        R<AppUser> r = appUserClient.getAppUserByPhone(phone);
        R<AppUser> r = appUserClient.getAppUserByPhone1(phone);
        if (R.isError(r)){
            return false;
        }