From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/java/com/matrix/system/common/interceptor/HostInterceptor.java | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/interceptor/HostInterceptor.java b/zq-erp/src/main/java/com/matrix/system/common/interceptor/HostInterceptor.java
index 505c871..7c441ef 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/interceptor/HostInterceptor.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/interceptor/HostInterceptor.java
@@ -1,13 +1,9 @@
package com.matrix.system.common.interceptor;
-import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
-
import com.matrix.system.common.bean.SysCompany;
import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
@@ -45,17 +41,8 @@
LogUtil.debug("匹配到公司{}", company.getComName());
return true;
} else {
- // 获得请求的域名
- String host = WebUtil.getRequest().getServerName();
- //判断是否为debug模式
- if(MatrixConstance.DEBUG){
- String debugHost=request.getHeader("debugHost");
- if(StringUtils.isNotBlank(debugHost)){
- host=debugHost;
- WebUtil.getSession().removeAttribute(ATTR_COMPANY);
- LogUtil.debug("debugHost={}",host);
- }
- }
+ // 获得请求的域名--由小程序直接传过来companyCode参数对应公司的网址
+ String host = request.getHeader("companyCode");
LogUtil.debug("当前请求域名{}", host);
@SuppressWarnings("unchecked")
Map<String, SysCompany> companyMap = (Map<String, SysCompany>) WebUtil.getServletContext()
--
Gitblit v1.9.1