Home Explore Help
Sign In
lhm
/
kmall-haikong
forked from project/kmall-haikong
1
0
Fork 0
Files
Browse Source

1.修改每周销售总结数据sql查询；2.修改取货码状态列表页面地址及无需登录直接访问

lsp 4 years ago
parent
d108b88b39
commit
49990c2176
4 changed files with 10 additions and 4 deletions
Unified View Show Diff Stats
  1. 1 1
      kmall-admin/src/main/resources/mybatis/mapper/statistics/MonthlyCustomersDao.xml
  2. 2 0
      kmall-admin/src/main/resources/spring/spring-shiro.xml
  3. 2 2
      kmall-admin/src/main/webapp/WEB-INF/page/pcd/hbk6zzez.html
  4. 5 1
      kmall-admin/src/main/webapp/js/pcd/hbk6zzez.js

+ 1 - 1
kmall-admin/src/main/resources/mybatis/mapper/statistics/MonthlyCustomersDao.xml
View File 

@@ -33,7 +33,7 @@
 
 		SELECT
 
 		SELECT
 
 		o.merch_sn AS merchSn,
 
 		o.merch_sn AS merchSn,
 
 		m.merch_name AS merchName,
 
 		m.merch_name AS merchName,
 
-		sum( o.order_price ) AS totalSales,
 
+		sum(  og.actual_payment_amount/ (1+og.goods_rate) ) + sum(og.discounted_price)AS totalSales,
 
 		sum( og.number) as totalNumber,
 
 		sum( og.number) as totalNumber,
 
 		count(DISTINCT o.id) as totalCustomers,
 
 		count(DISTINCT o.id) as totalCustomers,
 
 		DATE_FORMAT(o.pay_time,'%Y-%u') as yearAndWeek
 
 		DATE_FORMAT(o.pay_time,'%Y-%u') as yearAndWeek

+ 2 - 0
kmall-admin/src/main/resources/spring/spring-shiro.xml
View File 

@@ -77,6 +77,8 @@
 
                 /sys/login=anon
 
                 /sys/login=anon
 
                 /captcha.jpg=anon
 
                 /captcha.jpg=anon
 
                 /low-mp-ver.html=anon
 
                 /low-mp-ver.html=anon
 
+                /pcd/hbk6zzez.html=anon
 
+                /ws/server/**=anon
 
                 /**=authc
 
                 /**=authc
 
             </value>
 
             </value>
 
         </property>
 
         </property>

+ 2 - 2
kmall-admin/src/main/webapp/WEB-INF/page/sale/pickupcodeView.html → kmall-admin/src/main/webapp/WEB-INF/page/pcd/hbk6zzez.html
View File 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html>
 
 <html>
 
 <head>
 
 <head>
 
-    <title></title>
 
+    <title>取货码状态列表</title>
 
     #parse("sys/header.html")
 
     #parse("sys/header.html")
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
@@ -44,6 +44,6 @@
 
     </div>
 
     </div>
 
 </div>
 
 </div>
 
 
 
-<script src="${rc.contextPath}/js/sale/pickupcodeView.js?_${date.systemTime}"></script>
 
+<script src="${rc.contextPath}/js/pcd/hbk6zzez.js?_${date.systemTime}"></script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 5 - 1
kmall-admin/src/main/webapp/js/sale/pickupcodeView.js → kmall-admin/src/main/webapp/js/pcd/hbk6zzez.js
View File 

@@ -25,6 +25,10 @@ var webSocket;
 
 
 
 function openWebSocket() {
 
 function openWebSocket() {
 
 	var storeId = sessionStorage.getItem("storeId");
 
 	var storeId = sessionStorage.getItem("storeId");
 
+	//暂时性
 
+	if(!storeId){
 
+		storeId = 163
 
+	}
 
 	if ("WebSocket" in window) {
 
 	if ("WebSocket" in window) {
 
 		console.log("当前浏览器支持WebSocket");
 
 		console.log("当前浏览器支持WebSocket");
 
 
 
@@ -34,7 +38,7 @@ function openWebSocket() {
 
 		//无法使用wss，浏览器打开WebSocket时报错
 
 		//无法使用wss，浏览器打开WebSocket时报错
 
 		//ws对应http、wss对应https。
 
 		//ws对应http、wss对应https。
 
 		// webSocket = new WebSocket("ws://183.62.225.124:8080/ws/server/"+storeId);
 
 		// webSocket = new WebSocket("ws://183.62.225.124:8080/ws/server/"+storeId);
 
-		webSocket = new WebSocket("ws://127.0.0.1:8080//ws/server/163");
 
+		webSocket = new WebSocket("ws://127.0.0.1:8070/ws/server/163");
 
 		// webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
 
 		// webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
 
 		if (webSocket.readyState === webSocket.CONNECTING) {
 
 		if (webSocket.readyState === webSocket.CONNECTING) {
 
 			console.log('1.连接正在打开......');
 
 			console.log('1.连接正在打开......');