Merge remote-tracking branch 'origin/master'

mitao

2024-05-29 72401cca1d42db78aa25fc10758195b52dfcef96

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java

@@ -4,10 +4,14 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import com.ruoyi.system.api.domain.dto.RefundDTO;
import com.ruoyi.system.api.factory.OrderFallbackFactory;
import java.util.List;
import java.util.Map;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -56,4 +60,12 @@
    @GetMapping("/order/group-purchase-id/{id}")
    R<List<Order>> getOrderByGroupPurchaseId(@PathVariable("id") Long id,
            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/order-auction-bond/getOrderAuctionBondList")
    R<List<OrderAuctionBond>> getOrderAuctionBondList(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO,
                                                      @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/inner/pay/refund-batch")
    R<Map<String, Object>> refund(@RequestBody List<RefundDTO> refundDTOS,
            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
}