mirror of
				https://gitee.com/hhyykk/ipms-sjy.git
				synced 2025-11-04 04:08:43 +08:00 
			
		
		
		
	订单:
1、实现确认收货接口
This commit is contained in:
		@@ -135,11 +135,11 @@ public class AppTradeOrderController {
 | 
			
		||||
        return success(orderCount);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @PutMapping("/take")
 | 
			
		||||
    @PutMapping("/receive")
 | 
			
		||||
    @Operation(summary = "确认交易订单收货")
 | 
			
		||||
    @Parameter(name = "id", description = "交易订单编号")
 | 
			
		||||
    public CommonResult<Boolean> takeOrder(@RequestParam("id") Long id) {
 | 
			
		||||
        // TODO @芋艿:未实现,mock 用
 | 
			
		||||
    public CommonResult<Boolean> receiveOrder(@RequestParam("id") Long id) {
 | 
			
		||||
        tradeOrderService.receiveOrder(getLoginUserId(), id);
 | 
			
		||||
        return success(true);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -489,11 +489,6 @@ public class TradeOrderServiceImpl implements TradeOrderService {
 | 
			
		||||
        // TODO 芋艿:lili 发送商品被购买完成的数据
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public TradeOrderDO getOrder(Long id) {
 | 
			
		||||
        return tradeOrderMapper.selectById(id);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 校验交易订单满足可售货的条件
 | 
			
		||||
     *
 | 
			
		||||
@@ -516,6 +511,11 @@ public class TradeOrderServiceImpl implements TradeOrderService {
 | 
			
		||||
        return order;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public TradeOrderDO getOrder(Long id) {
 | 
			
		||||
        return tradeOrderMapper.selectById(id);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public TradeOrderDO getOrder(Long userId, Long id) {
 | 
			
		||||
        TradeOrderDO order = tradeOrderMapper.selectById(id);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user