From 4ece659308844cbe73053d3dd2a6f777f218eb13 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jan 2021 16:45:57 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
index 6fe4a05..06a441b 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
+++ b/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";
}
--
Gitblit v1.9.1