修改

xuhy

2025-01-15 cca60feb0538972d4e6b0021cc96c189a55dd4a4

修改

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java

@@ -54,7 +54,7 @@
            }

            @Override
            public R<List<Order>> byUserId(Long appUserId,Long shopId) {
            public R<List<Order>> byUserId(Long appUserId,Integer shopId) {
                return R.fail();
            }

@@ -62,6 +62,10 @@
            public R<List<Order>> byShopId(Integer shopId) {
                return R.fail();
            }
            @Override
            public R<List<Order>> byShopIdAndUserId(Integer shopId,Long userId) {
                return R.fail("通过门店和用户id查询订单失败");
            }
        };

    }

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java

@@ -32,9 +32,11 @@
    R<List<Order>> getOrderListByIds(@RequestBody List<Long> orderIds);

    @PostMapping("/order/byUserId")
    R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId,@RequestParam("shopId") Long shopId);
    R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId,@RequestParam("shopId") Integer shopId);
    @PostMapping("/order/byShopId")
    R<List<Order>> byShopId(@RequestParam("shopId") Integer shopId);
    @PostMapping("/order/byShopIdAndUserId")
    R<List<Order>> byShopIdAndUserId(@RequestParam("shopId") Integer shopId,@RequestParam("userId") Long userId);


    /**

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

@@ -676,7 +676,7 @@
        List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, id).list();
        byId.setBottomUsers(list);
        //消费总金额
        R<List<Order>> orderR = remoteOrderGoodsClient.byShopId(sysUser.getObjectId());
        R<List<Order>> orderR = remoteOrderGoodsClient.byShopIdAndUserId(sysUser.getObjectId(),userid);
        List<Order> orderList = orderR.getData();
        if (!CollectionUtils.isEmpty(orderList)){
            BigDecimal paymentAmount = orderList.stream().map(Order::getPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -726,7 +726,7 @@
    public R<List<Order>> orders(Long id) {
        Long userid = tokenService.getLoginUser().getUserid();
        SysUser sysUser = sysUserClient.getSysUser(userid).getData();
        Long shopId = Long.valueOf(sysUser.getObjectId());
        Integer shopId = sysUser.getObjectId();
        R<List<Order>> listR = remoteOrderGoodsClient.byUserId(id,shopId);
        return R.ok(listR.getData());


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java

@@ -239,7 +239,11 @@
    }
    @PostMapping("/byShopId")
    public R<List<Order>> byShopId(@RequestParam("shopId") Integer shopId){
        return R.ok(orderService.lambdaQuery().isNotNull(Order::getEndTime).eq(Order::getShopId, shopId).in(Order::getOrderStatus,4,7,8).list());
        return R.ok(orderService.lambdaQuery().isNotNull(Order::getEndTime).eq(Order::getShopId, shopId).list());
    }
    @PostMapping("/byShopIdAndUserId")
    public R<List<Order>> byShopIdAndUserId(@RequestParam("shopId") Integer shopId,@RequestParam("appUserId") Long appUserId){
        return R.ok(orderService.lambdaQuery().isNotNull(Order::getEndTime).eq(Order::getShopId, shopId).eq(Order::getAppUserId, appUserId).in(Order::getOrderStatus,4,7,8).list());
    }