From 1f4ac41109041ef9e2eb163cc03123e3a267650b Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 11 Jan 2021 09:17:05 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 5d99c8d..6fe4a05 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
@@ -23,10 +23,7 @@
import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.pojo.ShoppingCarItem;
import com.matrix.system.hive.pojo.ShoppingCarItemsVo;
-import com.matrix.system.hive.service.AchieveNewService;
-import com.matrix.system.hive.service.MoneyCardUseService;
-import com.matrix.system.hive.service.SysOrderItemService;
-import com.matrix.system.hive.service.SysOrderService;
+import com.matrix.system.hive.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
@@ -79,6 +76,9 @@
@Autowired
SysShopInfoDao shopInfoDao;
+
+ @Autowired
+ private SysVipInfoService sysVipInfoService;
/**
@@ -362,30 +362,32 @@
public String orderItem(SysOrder orderVo) {
// 根据id查到对应的订单信息
SysOrder order=null;
- if(orderVo.getId()!=null){
- order = orderService.findById(orderVo.getId());
- }else if(StringUtils.isNotBlank(orderVo.getOrderNo())){
+ if(orderVo.getId()!=null){
+ order = orderService.findById(orderVo.getId());
+ }else if(StringUtils.isNotBlank(orderVo.getOrderNo())){
List<SysOrder> byModel = orderService.findByModel(orderVo);
if(byModel.size()==1){
order=orderService.findById(byModel.get(0).getId());
}
- }
+ }
List<SysOrderItem> sysOrderItems = orderItemDao.selectByOrderId(order.getId());
order.setItems(sysOrderItems);
- WebUtil.getRequest().setAttribute("order", order);
+ SysVipInfo vipInfo = sysVipInfoService.findById(order.getVipId());
// 根据会员Id查到会员有效的会员卡
// 根据订单号查找订单条目
SysOrderItem orderItem = new SysOrderItem();
orderItem.setOrderId(order.getId());
List<SysOrderItem> orderItems = orderItemService.findByModel(orderItem);
- WebUtil.getRequest().setAttribute("orderItems", orderItems);
MoneyCardUse moneyCardUse = new MoneyCardUse();
moneyCardUse.setVipId(order.getVipId());
List<MoneyCardUse> cards = cardUseService.findByModel(moneyCardUse);
+ WebUtil.getRequest().setAttribute("orderItems", orderItems);
+ WebUtil.getRequest().setAttribute("order", order);
WebUtil.getRequest().setAttribute("cards", cards);
+ WebUtil.getRequest().setAttribute("vipInfo", vipInfo);
return "admin/hive/beautySalon/orderXq-form";
}
--
Gitblit v1.9.1