Merge branch 'feature/xgh/积分别名' into 'master'

Feature/xgh/积分别名

See merge request !2083

haoban-manage3-wx/pom.xml

@@ -257,6 +257,11 @@
             <artifactId>gic-cloud-image-api</artifactId>
             <version>${gic-cloud-image-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-webapp-common</artifactId>
+            <version>${gic-webapp-common}</version>
+        </dependency>
     </dependencies>
 
     <build>

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java

@@ -1624,6 +1624,7 @@ public class WxStaffController extends WebBaseController {
                 vo.setEnterpriseImg(enterpriseDTO.getQcloudImageUrl());
                 list.add(vo);
             }
+            this.integralAlias(list) ;
             return RestResponse.successResult(list);
         }
         // 门店列表
@@ -1722,9 +1723,25 @@ public class WxStaffController extends WebBaseController {
                 });
             }
         }
+        this.integralAlias(list) ;
         return RestResponse.successResult(list);
     }
 
+    private void integralAlias(List<StaffStoreVO> list) {
+        if(CollectionUtils.isNotEmpty(list)) {
+            for(StaffStoreVO vo : list) {
+                String enterpriseId = vo.getEnterpriseId() ;
+                Map<String, String> map = this.enterpriseService.getResultAlias(enterpriseId) ;
+                String integralText = map.get("积分");
+                if(org.apache.commons.lang.StringUtils.isBlank(integralText)) {
+                    integralText = "积分";
+                }
+                vo.setIntegralTextAlias(integralText);
+            }
+        }
+    }
+
+
     /**
      * 会员关联数量
      */

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/init/MyApplicationContextAware.java

 package com.gic.haoban.manage.web.init;
 
+import com.gic.commons.springsacn.SpringContextToolUtil;
 import com.gic.dict.api.dto.GlobalDictMap;
 import com.gic.dict.api.service.ManagerDictService;
 import org.apache.logging.log4j.LogManager;
@@ -8,9 +9,11 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.annotation.Import;
 import org.springframework.stereotype.Component;
 
 @Component
+@Import(SpringContextToolUtil.class)
 public class MyApplicationContextAware implements ApplicationContextAware {
     private final Logger log = LogManager.getLogger(MyApplicationContextAware.class);
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/StaffStoreVO.java

@@ -31,6 +31,16 @@ public class StaffStoreVO implements Serializable {
 	private Boolean enableHaoban;
 
 	private String storeCode;
+	// 积分别名
+	private String integralTextAlias ;
+
+	public String getIntegralTextAlias() {
+		return integralTextAlias;
+	}
+
+	public void setIntegralTextAlias(String integralTextAlias) {
+		this.integralTextAlias = integralTextAlias;
+	}
 
 	public Integer getMemberOpenCardFlag() {
 		return memberOpenCardFlag;

haoban-manage3-wx/src/main/webapp/WEB-INF/spring-servlet.xml

@@ -30,7 +30,7 @@
 	<mvc:annotation-driven>
 		<!-- 设置不使用默认的消息转换器 -->
 		<mvc:message-converters register-defaults="false">
-			<bean class="com.gic.haoban.manage.web.config.LongHttpMessageConverter"/>
+			<bean class="com.gic.web.common.converter.LongHttpMessageConverter"></bean>
 			<bean class="com.gic.haoban.common.ext.MappingJackson2HttpMessagePropertyViewConverter"/>
 			<bean class="org.springframework.http.converter.StringHttpMessageConverter">
 				<property name="supportedMediaTypes">

haoban-manage3-wx/src/main/webapp/WEB-INF/web.xml

@@ -42,7 +42,14 @@
     <url-pattern>/*</url-pattern>
     <dispatcher>ASYNC</dispatcher>
   </filter-mapping>
-
+  <filter>
+    <filter-name>replaceStreamFilter</filter-name>
+    <filter-class>com.gic.web.common.config.wrapper.RepetitionRequestFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>replaceStreamFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
   <filter>
     <filter-name>springSessionRepositoryFilter</filter-name>
     <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>