czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单查询接口修改

Browse Source
This commit is contained in:
SongZhang
2024-10-11 14:46:19 +08:00
parent 713ff653ad
commit e74fc42cf7
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java
View File

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* @website https://eladmin.vip * @website https://eladmin.vip
@@ -54,7 +55,7 @@ public class TbOrderInfoController {
@GetMapping("/{id}") @GetMapping("/{id}")
@ApiOperation("通过Id查询订单") @ApiOperation("通过Id查询订单")
public TbOrderInfoDto queryTbOrderInfo(@PathVariable("id") Integer id){ public Map<String, Object> queryTbOrderInfo(@PathVariable("id") Integer id){
return tbOrderInfoService.findById(id); return tbOrderInfoService.findById(id);
} }

7
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
View File

@@ -1,5 +1,6 @@
package cn.ysk.cashier.service.impl.order; package cn.ysk.cashier.service.impl.order;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.ysk.cashier.cons.TableConstant; import cn.ysk.cashier.cons.TableConstant;
@@ -257,7 +258,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
@Override @Override
@Transactional @Transactional
public TbOrderInfoDto findById(Integer id) { public Map<String, Object> findById(Integer id) {
TbOrderInfo tbOrderInfo = tbOrderInfoRepository.findById(id).orElseGet(TbOrderInfo::new); TbOrderInfo tbOrderInfo = tbOrderInfoRepository.findById(id).orElseGet(TbOrderInfo::new);
ValidationUtil.isNull(tbOrderInfo.getId(), "TbOrderInfo", "id", id); ValidationUtil.isNull(tbOrderInfo.getId(), "TbOrderInfo", "id", id);
TbOrderInfoDto dto = tbOrderInfoMapper.toDto(tbOrderInfo); TbOrderInfoDto dto = tbOrderInfoMapper.toDto(tbOrderInfo);
@@ -296,7 +297,9 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
dto.setDetailList(details); dto.setDetailList(details);
TbCashierCart cashierCart = tbCashierCartMapper.selectOne(new LambdaQueryWrapper<TbCashierCart>().eq(TbCashierCart::getOrderId, id).eq(TbCashierCart::getProductId, TableConstant.CART_SEAT_ID)); TbCashierCart cashierCart = tbCashierCartMapper.selectOne(new LambdaQueryWrapper<TbCashierCart>().eq(TbCashierCart::getOrderId, id).eq(TbCashierCart::getProductId, TableConstant.CART_SEAT_ID));
dto.setSeatInfo(cashierCart); dto.setSeatInfo(cashierCart);
return dto; Map<String, Object> data = BeanUtil.beanToMap(tbOrderInfo, false, false);
data.putAll(BeanUtil.beanToMap(dto, false, false));
return data;
} }
@Override @Override

2
eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbOrderInfoService.java
View File

@@ -62,7 +62,7 @@ public interface TbOrderInfoService {
* @param id ID * @param id ID
* @return TbOrderInfoDto * @return TbOrderInfoDto
*/ */
TbOrderInfoDto findById(Integer id); Map<String, Object> findById(Integer id);
/** /**
* 创建 * 创建