~jiangyouyao/beauty-erp.git

			@@ -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;


			/**
			@@ -373,19 +373,21 @@
			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";
			}

			@@ -39,17 +39,17 @@
			<el-col :span="7">
			<el-avatar :size="60" :src="circleUrl"></el-avatar>
			</el-col>
			<el-col :span="10" style="margin-left: 10px;">
			<label>于谦(vip-3)</label>
			<label>A00344</label>
			<el-col :span="15" style="margin-left: 10px;">
			<label>{{vipInfo.vipName}}({{vipInfo.vipLevel.levelName}})</label>
			<label>{{vipInfo.vipNo}}</label>
			</el-col>
			</el-row>
			<el-row style="line-height: 20px;">
			<label>订单号: <span>S1234567890</span></label>
			<label>下单顾问: <span>娟姐</span></label>
			<label>消费门店: <span>星海店</span></label>
			<label>订单时间: <span>2020-10-10 12:12</span></label>
			<label>备注: <span>这是一个好订单</span></label>
			<label>订单号: <span>{{order.orderNo}}</span></label>
			<label>下单顾问: <span>{{order.staffName}}</span></label>
			<label>消费门店: <span>{{order.shopName}}</span></label>
			<label>订单时间: <span>{{order.orderTime}}</span></label>
			<label>备注: <span>{{order.remark}}</span></label>
			</el-row>
			</el-col>
			</el-row>
			@@ -243,6 +243,8 @@
			var app = new Vue({
			el : "#app",
			data : {
			vipInfo : "",
			order : "",
			activeName : "first",
			circleUrl : "https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png",
			orderItems : [],
			@@ -251,6 +253,11 @@

			},
			created : function() {
			this.vipInfo = /[[${vipInfo}]]/
			this.order = /[[${order}]]/
			this.order.orderTime = moment(this.order.orderTime).format("YYYY-MM-DD HH:mm");
			console.log(this.vipInfo);
			console.log(this.order);
			},
			methods : {
			printf() {

	zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java	14 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html	23 ●●●●● patch \| view \| raw \| blame \| history