modify

Helius

2021-01-12 c9b157e19d101fd2d9a79c3db673f0c2cacd481c

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

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

    @Autowired
    private SysOrderFlowService sysOrderFlowService;


    /**
     * 计算订单金额
@@ -122,9 +125,25 @@
    }





    /**
     * 退款
     *
     * @param sysOrder
     * @return
     */
    @RequestMapping(value = "/refundOrder")
    @ResponseBody
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult refundOrder(@RequestBody SysOrder sysOrder) {
        SysUsers user = getMe();
        sysOrder.setShopId(user.getShopId());
        sysOrder.setStatu(Dictionary.ORDER_STATU_TK);
        //校验订单是否满足结算调价，新订单则保存订单，已有订单则删除后更新
        sysOrder = orderService.checkAndSaveOrder(sysOrder);
        orderService.refundOrderMoney(sysOrder);
        //处理用户购买的产品
        return AjaxResult.buildSuccessInstance(Arrays.asList(sysOrder), "订单退款成功");
    }


    /**
@@ -141,7 +160,6 @@
        //处理用户购买的产品
        return AjaxResult.buildSuccessInstance(Arrays.asList(sysOrder), "订单保存成功");
    }


    /**
     * 新建订单
@@ -376,18 +394,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";
    }