浏览代码

Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

zcb 4 年之前
父节点
当前提交
2c6e1db9a1

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

@@ -33,7 +33,7 @@
 		SELECT
 		o.merch_sn AS merchSn,
 		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,
 		count(DISTINCT o.id) as totalCustomers,
 		DATE_FORMAT(o.pay_time,'%Y-%u') as yearAndWeek

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

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title></title>
+    <title>取货码状态列表</title>
     #parse("sys/header.html")
 </head>
 <body>
@@ -44,6 +44,6 @@
     </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>
 </html>

+ 8 - 9
kmall-admin/src/main/webapp/js/sale/pickupcodeView.js → kmall-admin/src/main/webapp/js/pcd/hbk6zzez.js

@@ -13,8 +13,7 @@ let vm = new Vue({
         title: null,
 		pickUpCode: {},
 		q: {},
-		pickUpCodeList:{},
-		test: true
+		pickUpCodeList:{}
 	},
 	methods: {
 	}
@@ -25,6 +24,10 @@ var webSocket;
 
 function openWebSocket() {
 	var storeId = sessionStorage.getItem("storeId");
+	//暂时性
+	if(!storeId){
+		storeId = 163
+	}
 	if ("WebSocket" in window) {
 		console.log("当前浏览器支持WebSocket");
 
@@ -34,8 +37,8 @@ function openWebSocket() {
 		//无法使用wss,浏览器打开WebSocket时报错
 		//ws对应http、wss对应https。
 		// 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("wss://cb.k1net.cn/ws/server/"+storeId);
+		// webSocket = new WebSocket("ws://127.0.0.1:8080/ws/server/163");
+		webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
 		if (webSocket.readyState === webSocket.CONNECTING) {
 			console.log('1.连接正在打开......');
 		}
@@ -53,11 +56,7 @@ function openWebSocket() {
 			var data = Object.assign({}, JSON.parse(msg.data));
 			console.log('3.接收到服务端信息......data:'+data);
 			vm.sessionId = data.sessionId;
-
-			if(vm.test){
-				vm.pickUpCodeList = data.pickUpCodeList;
-				vm.test = false;
-			}
+			vm.pickUpCodeList = data.pickUpCodeList;
 		};
 		//连接关闭事件
 		webSocket.onclose = function () {