Commit 7dc398717ae762e34a93ab90a678ee6451fbd157

Authored by YunaiV
1 parent 503c996a

订单:

1、实现确认收货接口
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
@@ -135,11 +135,11 @@ public class AppTradeOrderController { @@ -135,11 +135,11 @@ public class AppTradeOrderController {
135 return success(orderCount); 135 return success(orderCount);
136 } 136 }
137 137
138 - @PutMapping("/take") 138 + @PutMapping("/receive")
139 @Operation(summary = "确认交易订单收货") 139 @Operation(summary = "确认交易订单收货")
140 @Parameter(name = "id", description = "交易订单编号") 140 @Parameter(name = "id", description = "交易订单编号")
141 - public CommonResult<Boolean> takeOrder(@RequestParam("id") Long id) {  
142 - // TODO @芋艿:未实现,mock 用 141 + public CommonResult<Boolean> receiveOrder(@RequestParam("id") Long id) {
  142 + tradeOrderService.receiveOrder(getLoginUserId(), id);
143 return success(true); 143 return success(true);
144 } 144 }
145 145
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
@@ -489,11 +489,6 @@ public class TradeOrderServiceImpl implements TradeOrderService { @@ -489,11 +489,6 @@ public class TradeOrderServiceImpl implements TradeOrderService {
489 // TODO 芋艿:lili 发送商品被购买完成的数据 489 // TODO 芋艿:lili 发送商品被购买完成的数据
490 } 490 }
491 491
492 - @Override  
493 - public TradeOrderDO getOrder(Long id) {  
494 - return tradeOrderMapper.selectById(id);  
495 - }  
496 -  
497 /** 492 /**
498 * 校验交易订单满足可售货的条件 493 * 校验交易订单满足可售货的条件
499 * 494 *
@@ -517,6 +512,11 @@ public class TradeOrderServiceImpl implements TradeOrderService { @@ -517,6 +512,11 @@ public class TradeOrderServiceImpl implements TradeOrderService {
517 } 512 }
518 513
519 @Override 514 @Override
  515 + public TradeOrderDO getOrder(Long id) {
  516 + return tradeOrderMapper.selectById(id);
  517 + }
  518 +
  519 + @Override
520 public TradeOrderDO getOrder(Long userId, Long id) { 520 public TradeOrderDO getOrder(Long userId, Long id) {
521 TradeOrderDO order = tradeOrderMapper.selectById(id); 521 TradeOrderDO order = tradeOrderMapper.selectById(id);
522 if (order != null 522 if (order != null