海豚英语
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
44323
2024-05-24 a623f1eb91b1d89872e3582b5747e9d7096ea225 
 ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TOrderController.java


@@ -1,19 +1,17 @@


package com.ruoyi.management.controller;






import com.ruoyi.common.core.domain.R;


import com.ruoyi.common.core.web.domain.AjaxResult;


import com.ruoyi.common.core.web.page.PageInfo;


import com.ruoyi.goods.api.domain.TGoods;


import com.ruoyi.goods.api.domain.TOrder;


import com.ruoyi.management.domain.TUser;


import com.ruoyi.management.dto.OrderDTO;


import com.ruoyi.management.dto.OrderQuery;


import com.ruoyi.goods.api.feignClient.GoodsClient;


import com.ruoyi.goods.api.model.OrderDTO;


import com.ruoyi.goods.api.model.OrderQuery;


import com.ruoyi.goods.api.model.TOrderVO;


import com.ruoyi.management.service.ITGoodsService;


import com.ruoyi.management.service.ITOrderService;


import com.ruoyi.management.service.ITUserService;


import com.ruoyi.management.vo.TOrderVO;


import io.swagger.annotations.ApiOperation;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Controller;


import org.springframework.web.bind.annotation.PostMapping;


@@ -21,9 +19,6 @@


import org.springframework.web.bind.annotation.ResponseBody;




import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.util.Date;


import java.util.List;




/**


 * <p>


@@ -42,47 +37,45 @@


    private ITUserService userService;


    @Autowired


    private ITGoodsService goodsService;


    @Autowired


    private GoodsClient goodsClient;


    @ResponseBody


    @PostMapping("/listAll")


    @ApiOperation(value = "列表查询", tags = {"后台-订单管理"})


    public AjaxResult<PageInfo<TOrderVO>> listAll(OrderQuery query) throws ParseException {


        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");




        if (query.getEndTime()!=null){


            Date parse = format.parse(query.getStartTime());


            Date parse1 = format.parse(query.getEndTime());


            query.setStartTime1(parse);


            query.setEndTime1(parse1);


        }


        List<TOrderVO> list = tOrderService.listAll(query);


        PageInfo<TOrderVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());


        res.setRecords(list);


        return AjaxResult.success(res);


//        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");


//


//        if (query.getEndTime()!=null){


//            Date parse = format.parse(query.getStartTime());


//            Date parse1 = format.parse(query.getEndTime());


//            query.setStartTime1(parse);


//            query.setEndTime1(parse1);


//        }


//        List<TOrderVO> list = tOrderService.listAll(query);


//        PageInfo<TOrderVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());


//        res.setRecords(list);


        PageInfo<TOrderVO> data = goodsClient.listAll1(query).getData();


        return AjaxResult.success(data);


    }


    @ResponseBody


    @PostMapping("/getOrderInfo")


    @ApiOperation(value = "查看详情", tags = {"后台-订单管理"})


    public AjaxResult<TOrderVO> getGoodsInfo(Integer id) {


        TOrder byId = tOrderService.getById(id);


        TGoods byId2 = goodsService.getById(byId.getGoodsId());


        TOrderVO tGoodsVO = new TOrderVO();


        tGoodsVO.setName(byId2.getName());


        BeanUtils.copyProperties(byId,tGoodsVO);


        TUser byId1 = userService.getById(byId.getUserId());


        tGoodsVO.setUserName(byId1.getName());


        tGoodsVO.setPhone(byId1.getPhone());


        return AjaxResult.success(tGoodsVO);


        TOrderVO data = goodsClient.getOrderInfo(id).getData();


        return AjaxResult.success(data);


    }


    @ResponseBody


    @PostMapping("/confirm")


    @ApiOperation(value = "确认发货", tags = {"后台-订单管理"})


    public AjaxResult<TOrderVO> getGoodsInfo(OrderDTO dto) {


        TOrder byId = tOrderService.getById(dto.getId());


        byId.setState(2);


        byId.setExpress(dto.getExpress());


        byId.setExpressNumber(dto.getExpressNumber());


        byId.setExpressTime(new Date());


        tOrderService.updateById(byId);


//        TOrder byId = tOrderService.getById(dto.getId());


//        byId.setState(2);


//        byId.setExpress(dto.getExpress());


//        byId.setExpressNumber(dto.getExpressNumber());


//        byId.setExpressTime(new Date());


//        tOrderService.updateById(byId);


        goodsClient.getGoodsInfo1(dto);


        R.tokenError("登陆失效");


        return AjaxResult.success("修改成功");


    }


}