Merge remote-tracking branch 'origin/master'

rentaiming

2024-05-27 43c263df4d8ce0cc830f287780c29db8a2b47f0f

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

@@ -4,7 +4,9 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.order.service.IOrderService;
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
@@ -33,9 +35,9 @@
    private final IOrderService orderService;
    @PostMapping("/saveOrderOne")
    @ResponseBody
    @InnerAuth
    public R<T> saveOrderOne(@RequestBody OrderDTO OrderDTO) {
        orderService.saveOrderOne(OrderDTO);

        return R.ok();

    }
@@ -52,4 +54,28 @@
    R<Integer> getSeckillMembers(@PathVariable("id") Long id) {
        return R.ok(orderService.getSeckillMembers(id));
    }

    /**
     * 获取团购商品已购数量
     *
     * @param id 团购商品id
     * @return 团购商品已购数量
     */
    @InnerAuth
    @GetMapping("/group-purchase-num/{id}")
    R<Integer> getGroupPurchasesGoodsNum(@PathVariable("id") Long id) {
        return R.ok(orderService.getGroupPurchasesGoodsNum(id));
    }

    /**
     * 获取团购商品已购订单列表
     *
     * @param id 团购商品id
     * @return List<Order> 订单列表
     */
    @InnerAuth
    @GetMapping("/group-purchase-id/{id}")
    R<List<Order>> getOrderByGroupPurchaseId(@PathVariable("id") Long id) {
        return R.ok(orderService.getOrderByGroupPurchaseId(id));
    }
}