xc-mall.git - Gitblit

parent: 481bf716 | patch | commit | show whitespace

xiaoyong931011

2023-02-24 aa95a0e99b6b7859dd117021974d0f1783e315cd

后台订单显示修改

3 files modified

	src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java	6 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java	7 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/modules/order/orderList.html	12 ●●●●● patch \| view \| raw \| blame \| history

 src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java

@@ -280,7 +280,7 @@
        orderSheet.setTitle(title);
//        String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品名称", "订单状态", "物流单号", "物流公司", "物流公司码"};
//        String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品详情", "物流单号", "物流公司", "物流公司码"};
        String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品详情", "物流单号", "物流公司", "物流公司码"};
        String[] header = {"订单编号", "收货姓名", "收货电话", "收货地址", "商品详情", "物流单号", "物流公司", "物流公司码"};
        orderSheet.setHeaders(header);

        QueryRequest request = new QueryRequest();
@@ -302,8 +302,8 @@
            for (MallOrderInfo item : dataList) {
                List<Object> temp = new ArrayList<>();
                temp.add(item.getOrderNo());
                temp.add(item.getAmount());
                temp.add(DateUtil.format(item.getOrderTime(), "yyyy-MM-dd HH:mm:ss"));
//                temp.add(item.getAmount());
//                temp.add(DateUtil.format(item.getOrderTime(), "yyyy-MM-dd HH:mm:ss"));
//                temp.add("快递配送");
                temp.add(item.getName());
                temp.add(item.getPhone());

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java

@@ -76,7 +76,10 @@
                if(CollUtil.isNotEmpty(mallOrderItemList)){
                    StringBuffer stringBuffer = new StringBuffer();
                    for(MallOrderItem mallOrderItem : mallOrderItemList){
                        stringBuffer.append(mallOrderItem.getGoodsName()).append("*").append(mallOrderItem.getCnt()).append(";");
                        stringBuffer.append(mallOrderItem.getGoodsName())
                                .append("-")
                                .append(mallOrderItem.getSkuName())
                                .append("*").append(mallOrderItem.getCnt()).append(";");
                    }
                    adminMallOrderInfoVo.setGoodsName(stringBuffer.toString());
                }
@@ -139,7 +142,7 @@
            StringBuffer orderItems = new StringBuffer();
            for (MallOrderItem item : mallOrderItems){
                StringBuffer orderItem = new StringBuffer();
                orderItems.append(item.getGoodsName()+"-"+item.getCnt()+"*"+item.getPrice()+"-合计"+item.getAmount()+"; \n ");
                orderItems.append(item.getGoodsName()+"-"+item.getSkuName()+"-"+item.getCnt()+"*"+item.getPrice()+"-合计"+item.getAmount()+"; \n ");
                orderItems.append(orderItem);
            }
            adminOrderDetailVo.setOrderItems(orderItems.toString());

 src/main/resources/templates/febs/views/modules/order/orderList.html

@@ -515,7 +515,7 @@
            //用于包含内容
            var v = document.createElement("div");
            //页面头部，导入css  ，media="print"表示打印时使用该样式
            var f = ["<head>", "<style>", "div{font-size:8px;}", ".main{width:100%;height:20%}",
            var f = ["<head>", "<style>", "div{font-size:8px;}", ".main{width:100%;height:10%}",
                ".main div{width:100%;display:inline-block;}", "</style>", "</head>"
            ].join("");
            var contentHtml = "";
@@ -523,11 +523,11 @@
                let data = allData[i]
                var template =
                    "<div class='main'>" +
                    // "<div style='text-align: center;font-size: 22px;font-weight: bold;margin-bottom: 30px'>订单详情</div>" +
                    "<div>姓名：" + data.name + "</div><br><br>" +
                    "<div>电话：" + data.phone + "</div><br><br>" +
                    "<div>地址：" + data.address + "</div><br><br>" +
                    "<div>编号：" + data.orderNo + "</div><br><br>" +
                    "<div style='text-align: center;font-size: 10px;font-weight: bold;margin-bottom: 10px'>订单编号：" + data.orderNo + "</div>" +
                    "<div>收货人：" + data.name + "，电话：" + data.phone + "，地址：" + data.address + "</div><br><br>" +
                    // "<div>电话：" + data.phone + "</div><br><br>" +
                    // "<div>地址：" + data.address + "</div><br><br>" +
                    // "<div>编号：" + data.orderNo + "</div><br><br>" +
                    "<div>商品：" + data.goodsName + "</div><br><br>" +
                    "</div>"

			@@ -280,7 +280,7 @@
			orderSheet.setTitle(title);
			// String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品名称", "订单状态", "物流单号", "物流公司", "物流公司码"};
			// String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品详情", "物流单号", "物流公司", "物流公司码"};
			String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品详情", "物流单号", "物流公司", "物流公司码"};
			String[] header = {"订单编号", "收货姓名", "收货电话", "收货地址", "商品详情", "物流单号", "物流公司", "物流公司码"};
			orderSheet.setHeaders(header);

			QueryRequest request = new QueryRequest();
			@@ -302,8 +302,8 @@
			for (MallOrderInfo item : dataList) {
			List<Object> temp = new ArrayList<>();
			temp.add(item.getOrderNo());
			temp.add(item.getAmount());
			temp.add(DateUtil.format(item.getOrderTime(), "yyyy-MM-dd HH:mm:ss"));
			// temp.add(item.getAmount());
			// temp.add(DateUtil.format(item.getOrderTime(), "yyyy-MM-dd HH:mm:ss"));
			// temp.add("快递配送");
			temp.add(item.getName());
			temp.add(item.getPhone());

			@@ -76,7 +76,10 @@
			if(CollUtil.isNotEmpty(mallOrderItemList)){
			StringBuffer stringBuffer = new StringBuffer();
			for(MallOrderItem mallOrderItem : mallOrderItemList){
			stringBuffer.append(mallOrderItem.getGoodsName()).append("*").append(mallOrderItem.getCnt()).append(";");
			stringBuffer.append(mallOrderItem.getGoodsName())
			.append("-")
			.append(mallOrderItem.getSkuName())
			.append("*").append(mallOrderItem.getCnt()).append(";");
			}
			adminMallOrderInfoVo.setGoodsName(stringBuffer.toString());
			}
			@@ -139,7 +142,7 @@
			StringBuffer orderItems = new StringBuffer();
			for (MallOrderItem item : mallOrderItems){
			StringBuffer orderItem = new StringBuffer();
			orderItems.append(item.getGoodsName()+"-"+item.getCnt()+"*"+item.getPrice()+"-合计"+item.getAmount()+"; \n ");
			orderItems.append(item.getGoodsName()+"-"+item.getSkuName()+"-"+item.getCnt()+"*"+item.getPrice()+"-合计"+item.getAmount()+"; \n ");
			orderItems.append(orderItem);
			}
			adminOrderDetailVo.setOrderItems(orderItems.toString());

			@@ -515,7 +515,7 @@
			//用于包含内容
			var v = document.createElement("div");
			//页面头部，导入css ，media="print"表示打印时使用该样式
			var f = ["<head>", "<style>", "div{font-size:8px;}", ".main{width:100%;height:20%}",
			var f = ["<head>", "<style>", "div{font-size:8px;}", ".main{width:100%;height:10%}",
			".main div{width:100%;display:inline-block;}", "</style>", "</head>"
			].join("");
			var contentHtml = "";
			@@ -523,11 +523,11 @@
			let data = allData[i]
			var template =
			"<div class='main'>" +
			// "<div style='text-align: center;font-size: 22px;font-weight: bold;margin-bottom: 30px'>订单详情</div>" +
			"<div>姓名：" + data.name + "</div><br><br>" +
			"<div>电话：" + data.phone + "</div><br><br>" +
			"<div>地址：" + data.address + "</div><br><br>" +
			"<div>编号：" + data.orderNo + "</div><br><br>" +
			"<div style='text-align: center;font-size: 10px;font-weight: bold;margin-bottom: 10px'>订单编号：" + data.orderNo + "</div>" +
			"<div>收货人：" + data.name + "，电话：" + data.phone + "，地址：" + data.address + "</div><br><br>" +
			// "<div>电话：" + data.phone + "</div><br><br>" +
			// "<div>地址：" + data.address + "</div><br><br>" +
			// "<div>编号：" + data.orderNo + "</div><br><br>" +
			"<div>商品：" + data.goodsName + "</div><br><br>" +
			"</div>"