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

查询订单详情接口修改

Browse Source
This commit is contained in:
SongZhang
2024-09-26 11:28:46 +08:00
parent 324e73c02c
commit 23127924f1
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
View File

@@ -50,16 +50,14 @@ public class OrderController {
/** /**
* 订单详情 * 订单详情
* @param shopId 店铺id
* @param orderId 订单id * @param orderId 订单id
* @return 订单信息 * @return 订单信息
*/ */
@GetMapping ("/orderInfo") @GetMapping ("/orderInfo")
public Result getCartByOrderId( public Result getCartByOrderId(
@RequestParam Integer shopId,
@RequestParam Integer orderId @RequestParam Integer orderId
){ ){
return Result.successWithData(orderService.orderDetail(shopId, orderId)); return Result.successWithData(orderService.orderDetail(orderId));
} }
@GetMapping("/orderList") @GetMapping("/orderList")

19
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@@ -448,16 +448,11 @@ public class OrderService {
return Result.success(CodeEnum.SUCCESS); return Result.success(CodeEnum.SUCCESS);
} }
public Object orderDetail(Integer shopId, Integer orderId) { public Object orderDetail(Integer orderId) {
TbShopInfo tbShopInfo = tbShopInfoMapper.selectByPrimaryKey(shopId);
if (tbShopInfo == null) {
return Result.fail("店铺不存在");
}
TbOrderInfo orderInfo = mpOrderInfoMapper.selectOne(new LambdaQueryWrapper<TbOrderInfo>() TbOrderInfo orderInfo = mpOrderInfoMapper.selectOne(new LambdaQueryWrapper<TbOrderInfo>()
.eq(TbOrderInfo::getId, orderId) .eq(TbOrderInfo::getId, orderId));
.eq(TbOrderInfo::getShopId, shopId));
if (orderInfo == null) { if (orderInfo == null) {
return Result.fail("订单不存在"); return Result.fail("订单不存在");
@@ -467,8 +462,14 @@ public class OrderService {
return Result.fail("订单不处于待支付状态"); return Result.fail("订单不处于待支付状态");
} }
TbShopInfo tbShopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId()));
if (tbShopInfo == null) {
return Result.fail("店铺不存在");
}
LambdaQueryWrapper<TbOrderDetail> queryWrapper = new LambdaQueryWrapper<TbOrderDetail>() LambdaQueryWrapper<TbOrderDetail> queryWrapper = new LambdaQueryWrapper<TbOrderDetail>()
.eq(TbOrderDetail::getShopId, shopId) .eq(TbOrderDetail::getShopId, orderInfo.getShopId())
.eq(TbOrderDetail::getOrderId, orderId); .eq(TbOrderDetail::getOrderId, orderId);
List<TbOrderDetail> list = mpOrderDetailMapper.selectList(queryWrapper); List<TbOrderDetail> list = mpOrderDetailMapper.selectList(queryWrapper);
@@ -492,8 +493,6 @@ public class OrderService {
dataList.add(item); dataList.add(item);
}); });
TbShopTable tbShopTable = shopTableMapper.selectQRcode(orderInfo.getTableId()); TbShopTable tbShopTable = shopTableMapper.selectQRcode(orderInfo.getTableId());
OrderVo orderVo = new OrderVo(); OrderVo orderVo = new OrderVo();