From 342161498b55526ff3ec897885cec30a373bd6fb Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 27 十二月 2024 13:49:25 +0800 Subject: [PATCH] 123 --- manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java | 80 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 78 insertions(+), 2 deletions(-) diff --git a/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java b/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java index b7402f2..cebff63 100644 --- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java +++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java @@ -1,9 +1,21 @@ package com.jilongda.manage.controller; -import org.springframework.web.bind.annotation.RequestMapping; +import com.jilongda.common.basic.ApiResult; +import com.jilongda.common.basic.PageInfo; +import com.jilongda.manage.model.*; +import com.jilongda.manage.query.TLineUpQuery; +import com.jilongda.manage.query.TOrderAccountingQuery; +import com.jilongda.manage.service.*; +import com.jilongda.manage.vo.TOrderAccountVO; +import com.jilongda.manage.vo.TOrderVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RestController; +import java.util.List; /** * <p> @@ -14,8 +26,72 @@ * @since 2024-12-09 */ @RestController +@Api(tags = "订单核算") @RequestMapping("/t-order-accounting") public class TOrderAccountingController { + @Autowired + private TStoreService storeService; + @Autowired + private TOrderService orderService; + @Autowired + private TOrderAccountingService orderAccountingService; + @Autowired + private TAppUserService appUserService; + @Autowired + private TOptometryDetailService optometryDetailService; + @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<TOrderAccountVO> detail(Integer id) { + TOrderAccountVO res = new TOrderAccountVO(); + TOrder byId = orderService.getById(id); + TOrderAccounting one = orderAccountingService.lambdaQuery().eq(TOrderAccounting::getOrderId, id).one(); + if (byId.getUserId()!=null){ + TAppUser byId1 = appUserService.getById(byId.getUserId()); + if(byId1!=null){ + res.setName(byId1.getName()); + res.setPhone(byId1.getPhone()); + } + } + res.setAge(byId.getAge()); + res.setRealName(byId.getRealName()); + res.setGender(byId.getGender()); + List<TOptometryDetail> list = optometryDetailService.lambdaQuery().eq(TOptometryDetail::getOrderId, id) + .eq(TOptometryDetail::getType, 1).list(); + res.setOptometryDetails(list); +// res.setOrderGoods(); +// res.setStoreName(); +// res.setOrderMoney(); +// res.setCouponMoney(); +// res.setPayMoney(); +// res.setPayType(); +// res.setRealPayMoney(); +// res.setCommission(); +// res.setProfitMoney(); +// res.setProfitRating(); + + + return ApiResult.success(res); + } + @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); + } } -- Gitblit v1.7.1