Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes

无关风月

2024-12-27 850edd78f6c0841c8494750d08532b5837003f44

 manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java

@@ -13,11 +13,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -40,6 +37,26 @@
    @ApiOperation(value = "核算订单分页列表")
    @PostMapping(value = "/pageList")
    public ApiResult<PageInfo<TOrderVO>> pageList(@RequestBody TOrderAccountingQuery query) {
        if (StringUtils.hasLength(query.getStartTime())){
            query.setStartTime(query.getStartTime()+" 00:00:00");
            query.setEndTime(query.getEndTime()+" 23:59:59");
        }
        PageInfo<TOrderVO> res = orderAccountingService.pageList(query);
        return ApiResult.success(res);
    }
    @ApiOperation(value = "核算详情页面")
    @GetMapping(value = "/detail")
    public ApiResult detail(Integer id) {

        return ApiResult.success();
    }
    @ApiOperation(value = "确认核算操作")
    @PostMapping(value = "/confirm")
    public ApiResult confirm(@RequestBody TOrderAccountingQuery query) {
        if (StringUtils.hasLength(query.getStartTime())){
            query.setStartTime(query.getStartTime()+" 00:00:00");
            query.setEndTime(query.getEndTime()+" 23:59:59");
        }
        PageInfo<TOrderVO> res = orderAccountingService.pageList(query);
        return ApiResult.success(res);
    }