From 2f8e70ad2884d2b6b7443dfae0af11ae9cfc8b99 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:44:10 +0800
Subject: [PATCH] bug修改
---
manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java | 55 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 17 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..fe8dd7b 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();
@@ -70,29 +81,39 @@
@ApiOperation(value = "订单售后详情")
@GetMapping(value = "/detail")
public ApiResult<TOrderAftersalesDetailVO> detail(Integer id) {
- TOrderAftersales byId = orderAftersalesService.getById(id);
- TOrder byId1 = orderService.getById(byId.getOrderId());
- TStore byId2 = tStoreService.getById(byId1.getStoreId());
- SecUser byId3 = secUserService.getById(byId.getSysId());
- TOptometrist byId5 = tOptometristService.getById(byId.getOptometristId());
+ TOrderAftersales orderAftersales = orderAftersalesService.getById(id);
+ TOrder order = orderService.getById(orderAftersales.getOrderId());
+ TStore store = tStoreService.getById(order.getStoreId());
+ SecUser sysUser = secUserService.getById(orderAftersales.getSysId());
+ TOptometrist optometrist = tOptometristService.getById(orderAftersales.getOptometristId());
TOrderAftersalesDetailVO res = new TOrderAftersalesDetailVO();
- res.setOrderId(byId1.getId());
- if (byId1.getUserId()!=null){
- TAppUser byId4 = appUserService.getById(byId1);
+ BeanUtils.copyProperties(orderAftersales,res);
+ res.setOrderId(order.getId());
+ if (order.getUserId()!=null){
+ TAppUser byId4 = appUserService.getById(order.getUserId());
if (byId4!=null){
res.setPhone(byId4.getPhone());
+ res.setName(byId4.getName());
+ res.setRealName(byId4.getRealName());
}
+ }else{
+ res.setPhone(order.getPhone());
+ res.setRealName(order.getRealName());
}
- res.setStoreName(byId2.getName());
- res.setOptometristName(byId5.getName());
- res.setSalesUser(byId3.getNickName());
- res.setOrderTime(TimeUtils.localDateTimeToString(byId1.getCreateTime()));
- res.setAfterSalesTime(TimeUtils.localDateTimeToString(byId.getCreateTime()));
- List<TOrderGoods> list = goodsService.lambdaQuery().eq(TOrderGoods::getOrderId, byId1.getId()).list();
+ res.setStoreName(store.getName());
+ if (optometrist!=null){
+ res.setOptometristName(optometrist.getName());
+ }
+ if (sysUser!=null){
+ res.setSalesUser(sysUser.getNickName());
+ }
+ res.setOrderTime(TimeUtils.localDateTimeToString(order.getCreateTime()));
+ res.setAfterSalesTime(TimeUtils.localDateTimeToString(orderAftersales.getCreateTime()));
+ List<TOrderGoods> list = goodsService.lambdaQuery().eq(TOrderGoods::getOrderId, order.getId()).list();
res.setGoodsList(list);
- res.setOrderMoney(byId1.getOrderMoney());
- res.setCouponMoney(byId1.getCouponMoney());
- res.setPayMoney(byId1.getPayMoney());
+ res.setOrderMoney(order.getOrderMoney());
+ res.setCouponMoney(order.getCouponMoney());
+ res.setPayMoney(order.getPayMoney());
return ApiResult.success(res);
}
--
Gitblit v1.7.1