Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 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);
}