修改bug

mitao

2024-09-21 f44e4d609e7efaed9eac545137970b1e334f8106

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java

@@ -1,20 +1,25 @@
package com.ruoyi.order.controller.forepart;


import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.service.IOrderService;
import com.ruoyi.order.vo.HomeGoodsSkuDTO1;
import com.ruoyi.order.vo.WdOrderVO;
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
import com.ruoyi.system.api.domain.dto.MemberOrderDTO;
import com.ruoyi.system.api.domain.dto.MemberOrderListDTO;
import com.ruoyi.system.api.domain.vo.MemberOrderListVO;
import com.ruoyi.system.api.domain.vo.MemberOrderNumVO;
import com.ruoyi.system.api.domain.vo.MemberTiOrderVO;
import com.ruoyi.system.api.domain.vo.OrderVO;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;


/**
@@ -34,6 +39,9 @@

    private final IOrderService orderService;

    @Resource
    private GoodsSkuClient goodsSkuClient;

    @PostMapping("/saveMemberOrder")
    @ApiOperation(value = "用户端-立即下单")
    public R<MemberTiOrderVO> saveMemberOrder(@RequestBody MemberOrderDTO memberOrderDTO) {
@@ -44,6 +52,13 @@
    @ApiOperation(value = "用户端-修改订单")
    public R<MemberTiOrderVO> updMemberOrder(@RequestBody MemberOrderDTO memberOrderDTO) {
        return R.ok(orderService.updMemberOrder(memberOrderDTO));
    }

    @PostMapping("/updMemberOrderbz")
    @ApiOperation(value = "用户端-修改订单备注")
    public R updMemberOrderbz(@RequestBody MemberOrderDTO memberOrderDTO) {
        orderService.updMemberOrderbz(memberOrderDTO);
        return R.ok();
    }


@@ -66,6 +81,13 @@
        return R.ok();
    }

    @PostMapping("/delOrderOne")
    @ApiOperation(value = "用户端-删除订单")
    public R delOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO) {
        orderService.delOrderOne(memberOrderListDTO);
        return R.ok();
    }

    @PostMapping("/AffirmOrderOne")
    @ApiOperation(value = "用户端-确认收货订单")
    public R AffirmOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO) {
@@ -80,4 +102,10 @@
        return R.ok(orderService.MemberOrderNum(memberOrderListDTO));
    }

    @PostMapping("/CtjlGoodsGroupPurchase")
    @ApiOperation(value = "用户端-我的参团记录")
    public R<PageDTO<WdOrderVO>> CtjlGoodsGroupPurchase(@RequestBody HomeGoodsSkuDTO1 homeGoodsSkuDTO1) {
        return R.ok(orderService.CtjlGoodsGroupPurchase(homeGoodsSkuDTO1));
    }

}