Merge branch 'feature-content2' into developer

haoban-manage3-service/pom.xml

@@ -177,12 +177,6 @@
 
         <dependency>
             <groupId>com.gic</groupId>
-            <artifactId>gic-sharding-sdk</artifactId>
-            <version>4.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.gic</groupId>
             <artifactId>gic-store-goods-api</artifactId>
             <version>${gic-store-goods-api}</version>
         </dependency>

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/NoticeMessageApiServiceImpl.java

@@ -19,6 +19,7 @@ import com.gic.haoban.manage.api.dto.notify.qdto.NotifyMessageBatchQDTO;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
 import com.gic.wechat.api.dto.qywx.QywxTemplateCardSendMessageDTO;
 import org.apache.commons.collections.CollectionUtils;
@@ -170,6 +171,8 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
             logger.info("商户未关联好办或都已停用enterpriseId={}", enterpriseId);
             return ServiceResponse.success();
         }
+        List<TabHaobanWxEnterprise> wxEnterpriseList = wxEnterpriseRelatedService.listByEnterpriseId(enterpriseId);
+        List<String> wxEnterpriseIdList = wxEnterpriseList.stream().map(TabHaobanWxEnterprise::getWxEnterpriseId).collect(Collectors.toList());
         List<String> clerkIdList = clerkService.getclerkListByStoreIds(storeIdList);
         if (CollectionUtils.isEmpty(clerkIdList)) {
             logger.info("门店导购列表为空");
@@ -186,7 +189,7 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
             return ServiceResponse.success();
         }
         notifyMessageBatchQDTO.setTemplateCode(messageTypeEnum.getTemplateCode());
-        Map<String, List<StaffClerkRelationDTO>> map = relationList.stream().collect(Collectors.groupingBy(StaffClerkRelationDTO::getWxEnterpriseId));
+        Map<String, List<StaffClerkRelationDTO>> map = relationList.stream().filter(x->wxEnterpriseIdList.contains(x.getWxEnterpriseId())).collect(Collectors.groupingBy(StaffClerkRelationDTO::getWxEnterpriseId));
         map.forEach((wxEnterpriseId,v)->{
             WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
             if (qwDTO == null) {

haoban-manage3-service/src/main/resources/applicationContext-conf.xml

@@ -9,7 +9,6 @@
     <import resource="classpath:dubbo-haoban-manage-service.xml" />
     <import resource="classpath:dubbo-setting-test.xml"/>
     <import resource="classpath:jdbc-haoban-manage-service.xml" />
-<!--    <import resource="classpath*:jdbc-haoban-manage-service-sharding.xml" />-->
     <import resource="classpath*:log-record-init.xml" />
     <import resource="classpath*:kafka-setting-data.xml" />
 </beans>
\ No newline at end of file

haoban-manage3-service/src/main/resources/jdbc-haoban-manage-service-sharding.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-	http://www.springframework.org/schema/beans/spring-beans.xsd
-	http://www.springframework.org/schema/context
-	http://www.springframework.org/schema/context/spring-context.xsd
-	http://www.springframework.org/schema/tx
-	http://www.springframework.org/schema/tx/spring-tx.xsd">
-
-    <context:annotation-config />
-
-<!--    <import resource="classpath*:applicationContext-db-only-with-emoji.xml"/>-->
-    <import resource="classpath*:applicationContext-sharding-db.xml" />
-
-    <bean class="com.gic.haoban.common.init.HaobanSqlSessionFactoryBean" id="sqlSessionFactory">
-        <property name="dataSource" ref="dataSource" />
-        <property name="typeAliasesPackage" value="com.gic.haoban.**.entity,com.gic.haoban.*.entity" />
-        <property name="mapperLocations" value="classpath*:mapper/**/*.xml" />
-        <property name="plugins">
-            <array>
-                <bean class="com.github.pagehelper.PageHelper">
-                    <property name="properties">
-                        <value>
-                            dialect=mysql
-                        </value>
-                    </property>
-                </bean>
-            </array>
-        </property>
-    </bean>
-    <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="com.gic.haoban.**.dao.mapper,com.gic.haoban.*.mapper" />
-        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
-    </bean>
-    <bean class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-        <property name="dataSource" ref="dataSource" />
-    </bean>
-    <!-- 事务管理器 -->
-    <bean id="txManager"
-          class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-        <property name="dataSource" ref="dataSource" />
-    </bean>
-    <tx:annotation-driven transaction-manager="txManager" />
-</beans>
\ No newline at end of file

haoban-manage3-service/src/main/resources/kafka-setting.xml

@@ -39,7 +39,7 @@
                 <value>haoban_gic_clerk</value>
                 <value>haoban_gic_store</value>
                 <value>haoban_gic_store_group</value>
-                <value>tab_haoban_member_order_event</value>
+                <value>tab_haoban_member_order_event_prod</value>
                 <value>haoban_gic_order</value>
             </list>
         </constructor-arg>