4 years ago · 908c22ec6a
--- a/src/main/resources/com/minpay/db/table/own/mapper/OrderManageMapper.xml
+++ b/src/main/resources/com/minpay/db/table/own/mapper/OrderManageMapper.xml
@@ -4,7 +4,7 @@
 
																 	<select id="selectOrderDetail" resultType="hashmap" parameterType="java.util.Map">
															
 
																 	    SELECT
															
 
																-		o.VOD_DETAILS_ID  				"orderNo",
															
 
																+		d.VOI_ID				"orderNo",
															
 
																 		o.VOD_PRODUCT_ID 		"productId",
															
 
																 		o.VOD_PRO_NAME 			"productName",
															
 
																 		p.VCI_NAME 				"userName",
															
@@ -19,7 +19,8 @@
 
																 		r.VCI_GAME_PRICE 		"gamePrice",
															
 
																 		r.VCI_COST_PRICE 		"costPrice",
															
 
																 		e.VEQ_IMEI_ADDR 		"imeiAddr",
															
 
																-		r.VCI_AISLE 			"aisle"
															
 
																+		r.VCI_AISLE 			"aisle",
															
 
																+		o.VOD_DETAILS_ID 		"detailsId"
															
 
																 	    FROM vm_order_details o,vm_order_inf d, vm_pro_equ_rel r, vm_person_inf p,vm_equipment_inf e
															
 
																 		where o.VOD_PRO_EQU_REL_ID = r.VCI_ID
															
 
																 		and d.VOI_PERSON_ID = p.VCI_ID
															
--- a/src/main/webapp/admin/salesDataManage/salesData.html
+++ b/src/main/webapp/admin/salesDataManage/salesData.html
@@ -4,6 +4,10 @@
 
																     <meta charset="utf-8">
															
 
																     <title>销售数据</title>
															
 
																     <script src="../../js/min-loader-next.js"></script>
															
 
																+    <style type="text/css">
															
 
																+        .layui-table-cell{height:60px;line-height:60px}
															
 
																+        img{width:auto;height:auto;max-width:100%;max-height:100%;},
															
 
																+    </style>
															
 
																 </head>
															
 
																 <body class="content">
															
 
																 <div class="order-body">