modify

Helius

2021-01-12 15e19113558e46aaf8f7263a66730fc01aadf603

 zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java

@@ -80,6 +80,9 @@
    @Autowired
    private SysVipInfoService sysVipInfoService;

    @Autowired
    private SysOrderFlowService sysOrderFlowService;


    /**
     * 计算订单金额
@@ -376,18 +379,24 @@
        SysVipInfo vipInfo = sysVipInfoService.findById(order.getVipId());
        // 根据会员Id查到会员有效的会员卡
        // 根据订单号查找订单条目
        SysOrderItem orderItem = new SysOrderItem();
        orderItem.setOrderId(order.getId());
        List<SysOrderItem> orderItems = orderItemService.findByModel(orderItem);
        List<SysOrderItem> orderItems = orderItemService.findByOrderId(order.getId());

        MoneyCardUse moneyCardUse = new MoneyCardUse();
        moneyCardUse.setVipId(order.getVipId());
        List<MoneyCardUse> cards = cardUseService.findByModel(moneyCardUse);

        List<SysOrderFlow> flows = sysOrderFlowService.findByOrderId(order.getId());
        order.setFlows(flows);

        List<SysOrderFlow> payMethods = sysOrderFlowService.findPayMethodsAmount(order.getId());

        List<AchieveNew> achieveList = achieveNewService.findOrderItemAchieve(order.getId());
        WebUtil.getRequest().setAttribute("orderItems", orderItems);
        WebUtil.getRequest().setAttribute("order", order);
        WebUtil.getRequest().setAttribute("cards", cards);
        WebUtil.getRequest().setAttribute("vipInfo", vipInfo);
        WebUtil.getRequest().setAttribute("payMethods", payMethods);
        WebUtil.getRequest().setAttribute("achieveList", achieveList);
        return "admin/hive/beautySalon/orderXq-form";
    }