fix
Helius
2021-09-22 5891fbcb6a2cb662c24c379e6368f13293e6b0c2
fix
5 files modified
29 ■■■■■ changed files
sql/xc_mall.sql 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java 13 ●●●●● patch | view | raw | blame | history
sql/xc_mall.sql
@@ -241,3 +241,5 @@
  PRIMARY KEY (ID)
)  COMMENT = '物流信息表';
alter table mall_order_info add receiving_time datetime null comment '收货时间';
src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
@@ -78,4 +78,11 @@
        return new FebsResponse().success().data(mallOrderInfoService.findOrderDetailsById(id));
    }
    @ApiOperation(value = "确认收货", notes = "确认收货")
    @PostMapping(value = "/confirm/{id}")
    public FebsResponse confirm(@PathVariable("id") Long id) {
        mallOrderInfoService.confirmOrder(id);
        return new FebsResponse().success().message("确认成功");
    }
}
src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
@@ -62,6 +62,11 @@
     */
    private Integer delFlag;
    /**
     * 确认收货时间
     */
    private Date receivingTime;
    @TableField(exist = false)
    private List<MallOrderItem> items;
}
src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java
@@ -21,4 +21,6 @@
    List<OrderListVo> findOrderList(OrderListDto orderListDto);
    OrderDetailVo findOrderDetailsById(Long id);
    void confirmOrder(Long id);
}
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -191,4 +191,17 @@
        }
        return orderDetailVo;
    }
    @Override
    public void confirmOrder(Long id) {
        MallMember member = LoginUserUtil.getLoginUser();
        MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), id);
        if (orderInfo == null) {
            throw new FebsException("订单不存在");
        }
        orderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
        orderInfo.setReceivingTime(new Date());
        this.baseMapper.updateById(orderInfo);
    }
}