From e10c8d1bd9a4ba2e632df6b5aecd90f75f7f5438 Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期三, 17 七月 2024 09:10:29 +0800 Subject: [PATCH] 修改bug --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberTiOrderVO.java | 2 ++ ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java | 4 ++++ ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java | 1 + ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java | 5 +++++ 4 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java index fbfeaf1..a98bc77 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java @@ -123,6 +123,7 @@ @ApiModelProperty(value = "规格单位") @JsonInclude(JsonInclude.Include.ALWAYS) private String specUnit; + @ApiModelProperty(value = "商品说明") @JsonInclude(JsonInclude.Include.ALWAYS) private String detail; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberTiOrderVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberTiOrderVO.java index 017c646..791eac6 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberTiOrderVO.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberTiOrderVO.java @@ -97,4 +97,6 @@ @ApiModelProperty(value = "实际商品价格") @JsonInclude(JsonInclude.Include.ALWAYS) private BigDecimal sjPrice; + + } 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 cc1f05e..c9aea7f 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 @@ -103,6 +103,11 @@ } @Override + public R refund1(RefundDTO refundDTOS, String source) { + return null; + } + + @Override public R<List<OrderAuctionBond>> getOrderAuctionBondList(Long id, AuctionOrderTypeEnum auctionOrderTypeEnum, BondStatusEnum bondStatusEnum, String source) { 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 49ccaf2..d766ee5 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 @@ -118,6 +118,10 @@ R<Map<String, Object>> refund(@RequestBody List<RefundDTO> refundDTOS, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + @PostMapping("/pay/refund-batch1") + R refund1(@RequestBody RefundDTO refundDTOS, + @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + /** * 查询保证金订单列表 * -- Gitblit v1.7.1