Merge remote-tracking branch 'origin/dev' into dev

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml

@@ -460,7 +460,6 @@
         inner join (
         select a.pk_member,a.new_level pk_awards
         from cu_member_awards a
-        where a.del_flag = 0
         inner join(
         select pk_member, max(pk_id) pk_id
         from cu_member_awards
@@ -468,7 +467,9 @@
         and end_validity_date <= #{settleDate, jdbcType=DATE}
         and award_type = #{awardType}
         group by pk_member) b
-        on a.pk_id = b.pk_id ) y
+        on a.pk_id = b.pk_id
+        where a.del_flag = 0
+        ) y
         on x.pk_member=y.pk_member
         where
         <if test="awardType == 1">

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberMapper.xml

@@ -328,7 +328,6 @@
         inner join (
         select a.pk_member,a.new_level pk_awards
         from cu_member_awards a
-        where a.del_flag = 0
         inner join (
         select pk_member, max(pk_id) pk_id
         from cu_member_awards
@@ -337,7 +336,9 @@
         and end_validity_date <= #{settleDate, jdbcType=DATE}
         and award_type = #{awardType}
         group by pk_member) b
-        on a.pk_id = b.pk_id) y
+        on a.pk_id = b.pk_id
+        where a.del_flag = 0
+        ) y
         on x.pk_id = y.pk_member
         where
         <if test="awardType == 1">

bd-third/src/main/resources/application-online.properties

@@ -1,14 +1,14 @@
 
 ### 调度中心部署跟地址 [选填]：如调度中心集群部署存在多个地址则用逗号分隔。执行器将会使用该地址进行"执行器心跳注册"和"任务结果回调"；为空则关闭自动注册；
-xxl.job.admin.addresses=http://172.26.201.190:8181/xxl-admin
+xxl.job.admin.addresses=http://172.26.201.209:8181/xxl-admin
 
 # log config
 logging.config=classpath:logback.xml
 
 ### 执行器通讯TOKEN [选填]：非空时启用；
-xxl.job.accessToken=retail_token_online
+xxl.job.accessToken=re_token_online
 ### 执行器AppName [选填]：执行器心跳注册分组依据；为空则关闭自动注册
-xxl.job.executor.appname=xxl-job-retail
+xxl.job.executor.appname=xxl-job-re
 ### 执行器注册 [选填]：优先使用该配置作为注册地址，为空时使用内嵌服务 ”IP:PORT“ 作为注册地址。从而更灵活的支持容器类型执行器动态IP和动态映射端口问题。
 xxl.job.executor.address=
 ### 执行器IP [选填]：默认为空表示自动获取IP，多网卡时可手动设置指定IP，该IP不会绑定Host仅作为通讯实用；地址信息用于 "执行器注册" 和 "调度中心请求并触发任务"；

pom.xml

@@ -463,7 +463,7 @@
                 <!--当前环境-->
                 <profile.name>online</profile.name>
                 <!--Nacos服务地址-->
-                <config.server-addr></config.server-addr>
+                <config.server-addr>172.26.201.209:8847</config.server-addr>
                 <!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
                 <config.namespace></config.namespace>
                 <!--Nacos配置分组名称-->
@@ -471,7 +471,7 @@
                 <!--Nacos用户名-->
                 <config.username>nacos</config.username>
                 <!--Nacos密码-->
-                <config.password></config.password>
+                <config.password>reOnline_nacos#202</config.password>
             </properties>
         </profile>
     </profiles>