Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java

@@ -169,6 +169,13 @@
        return R.ok(orderService.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO));
    }

    @InnerAuth
    @ResponseBody
    @PostMapping("/getOrderByGroupPurchaseMemberList1")
    R<List<OrderVO>> getOrderByGroupPurchaseMemberList1(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
        return R.ok(orderService.getOrderByGroupPurchaseMemberList1(homeGoodsSkuDTO));
    }



    /**
@@ -228,4 +235,11 @@
        orderService.updateOrderStatusByMubres1(formedGroupMubres);
        return R.ok();
    }

    @InnerAuth
    @PostMapping("/updOrderStatusByMubres2")
    R<List<Order>> updateOrderStatusByMubres2(@RequestBody String formedGroupMubres) {
        orderService.updateOrderStatusByMubres2(formedGroupMubres);
        return R.ok();
    }
}