20210923

xiaoyong931011

2021-09-23 eda28374083dbb6cf58c4d1fb6794e6d261c2a45

 src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java

@@ -4,8 +4,10 @@
import cc.mrbird.febs.common.entity.FebsConstant;
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.mall.service.IAdminMallOrderService;
import cc.mrbird.febs.mall.vo.AdminMailGoodsDetailVo;
import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryVo;
import cc.mrbird.febs.mall.vo.AdminMallOrderVo;
import cc.mrbird.febs.mall.vo.AdminOrderDetailVo;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
@@ -20,6 +22,8 @@
public class ViewMallOrderController extends BaseController {

    private final IAdminMallOrderService adminMallOrderService;

    public static long idFromMember;

    /**
     * 订单列表
@@ -41,8 +45,23 @@
    @RequiresPermissions("deliverGoods:update")
    public String deliverGoods(@PathVariable long id, Model model) {
        AdminMallOrderVo data = adminMallOrderService.getMallOrderInfoById(id);
        model.addAttribute("orderInfo", data);
        model.addAttribute("deliverInfo", data);
        return FebsUtil.view("modules/order/deliverGoods");
    }

    /**
     * 订单-详情
     * @param id
     * @param model
     * @return
     */
    @GetMapping("orderDetail/{id}")
    @RequiresPermissions("orderDetail:view")
    public String orderDetail(@PathVariable long id, Model model) {
        idFromMember = id;
        AdminOrderDetailVo data = adminMallOrderService.getMallOrderDetailById(id);
        model.addAttribute("orderDetail", data);
        return FebsUtil.view("modules/order/orderDetail");
    }

}