From 277d0e97ca1acf1727ce4fbb97049ef4707315ed Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期一, 29 七月 2024 13:34:43 +0800 Subject: [PATCH] 修改bug --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java | 3 +++ ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java | 8 ++++++++ ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/HomeGoodsSkuDTO.java | 5 +++++ ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java | 5 +++++ ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java | 10 ++++++++++ 5 files changed, 31 insertions(+), 0 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/HomeGoodsSkuDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/HomeGoodsSkuDTO.java index 0fc9f36..be62c5d 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/HomeGoodsSkuDTO.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/HomeGoodsSkuDTO.java @@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel(value = "首页商品传输对象", description = "首页商品传输对象") public class HomeGoodsSkuDTO extends BasePage { @@ -45,4 +47,7 @@ private String formId; + @ApiModelProperty(value = "商品skuIds") + private List<Long> goodsSkuIds; + } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java index d9533d0..5dd115b 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java @@ -94,6 +94,11 @@ } @Override + public R<List<OrderVO>> getOrderByGroupPurchaseMemberList1(HomeGoodsSkuDTO homeGoodsSkuDTO, String source) { + return null; + } + + @Override public R<List<OrderAuctionBond>> getOrderAuctionBondList1(MemberAuctionSalesroomDTO memberAuctionSalesroomDTO, String source) { return R.fail("获取保证金订单列表失败:" + cause.getMessage()); } @@ -175,6 +180,11 @@ return null; } + @Override + public R<List<Order>> updateOrderStatusByMubres2(String formedGroupMubres, String source) { + return null; + } + }; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java index 391d19c..12410c9 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java @@ -62,6 +62,11 @@ } @Override + public R<SysUser> queryUserByPhone1(String phone) { + return null; + } + + @Override public R<SysUser> queryUserByUserName(String userName) { return R.fail("通过账号查询用户失败:" + cause.getMessage()); } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java index 092dc93..7e841dd 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java @@ -102,6 +102,10 @@ R<List<OrderVO>> getOrderByGroupPurchaseMemberList(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + @PostMapping("/order/getOrderByGroupPurchaseMemberList1") + R<List<OrderVO>> getOrderByGroupPurchaseMemberList1(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO, + @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + @PostMapping("/order-auction-bond/getOrderAuctionBondList1") R<List<OrderAuctionBond>> getOrderAuctionBondList1(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); @@ -204,4 +208,8 @@ @PostMapping("/order/updOrderStatusByMubres1") R<?> updateOrderStatusByMubres1(@RequestBody String formedGroupMubres, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + @PostMapping("/order/updOrderStatusByMubres2") + R<List<Order>> updateOrderStatusByMubres2(@RequestBody String formedGroupMubres, + @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java index e8d70e7..7b415c2 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java @@ -69,6 +69,9 @@ @PostMapping("/user/queryUserByPhone") R<SysUser> queryUserByPhone(@RequestBody String phone); + @PostMapping("/user/queryUserByPhone1") + R<SysUser> queryUserByPhone1(@RequestBody String phone); + /** * 通过账号查询用户 * @param userName -- Gitblit v1.7.1