From d02d3b681da14c2f342f2247457dc60b426ff299 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 07 一月 2025 17:50:16 +0800
Subject: [PATCH] bug修改
---
manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java b/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
index c322807..d169bb7 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
@@ -17,7 +17,9 @@
import com.jilongda.manage.vo.TOrderAftersalesVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
@@ -56,6 +58,10 @@
@ApiOperation(value = "订单售后列表")
@PostMapping(value = "/pageList")
public ApiResult<PageInfo<TOrderAftersalesVO>> pageList(@RequestBody TOrderAftersalesQuery query) {
+ if (StringUtils.hasLength(query.getStartTime())){
+ query.setStartTime(query.getStartTime()+" 00:00:00");
+ query.setEndTime(query.getEndTime()+" 23:59:59");
+ }
PageInfo<TOrderAftersalesVO> orderAftersalesVOPageInfo = orderAftersalesService.pageList(query);
return ApiResult.success(orderAftersalesVOPageInfo);
}
@@ -63,6 +69,11 @@
@ApiOperation(value = "订单售后添加")
@PostMapping(value = "/add")
public ApiResult<String> add(@RequestBody TOrderAftersales dto) {
+ List<TOrderAftersales> list = orderAftersalesService.lambdaQuery()
+ .eq(TOrderAftersales::getOrderId, dto.getOrderId()).list();
+ if (!list.isEmpty()){
+ return ApiResult.failed("该订单已售后,不可再次操作!");
+ }
dto.setCode(WarehousingConstant.ASTER_SALES+ CodeGenerateUtils.generateVolumeSn());
orderAftersalesService.save(dto);
return ApiResult.success();
@@ -76,12 +87,18 @@
SecUser byId3 = secUserService.getById(byId.getSysId());
TOptometrist byId5 = tOptometristService.getById(byId.getOptometristId());
TOrderAftersalesDetailVO res = new TOrderAftersalesDetailVO();
+ BeanUtils.copyProperties(byId,res);
res.setOrderId(byId1.getId());
if (byId1.getUserId()!=null){
- TAppUser byId4 = appUserService.getById(byId1);
+ TAppUser byId4 = appUserService.getById(byId1.getUserId());
if (byId4!=null){
res.setPhone(byId4.getPhone());
+ res.setName(byId4.getName());
+ res.setRealName(byId4.getRealName());
}
+ }else{
+ res.setPhone(byId1.getPhone());
+ res.setRealName(byId1.getRealName());
}
res.setStoreName(byId2.getName());
res.setOptometristName(byId5.getName());
--
Gitblit v1.7.1