Merge remote-tracking branch 'origin/developerD' into developer

# Conflicts:
#	src/main/java/com/caimei365/order/service/impl/RemoteCallServiceImpl.java
#	src/main/resources/mapper/MessagePushMapper.xml

src/main/java/com/caimei365/order/controller/BaseApi.java

@@ -45,9 +45,9 @@ public class BaseApi {
     /**
      * 老用户发短信临时接口
      */
-//    @GetMapping("/getOld")
-//    public void getOldUser() {
-//        remoteCallService.getOldUser();
-//    }
+    @GetMapping("/getOld")
+    public void getOldUser() {
+        remoteCallService.getOldUser();
+    }
 }
 

src/main/resources/mapper/MessagePushMapper.xml

@@ -20,14 +20,42 @@
         WHERE shortLink = #{shortLink}
     </select>
     <select id="findOldUser" resultType="com.caimei365.order.model.vo.PushMessageUserVo">
-        SELECT c.userID, c.clubID, c.contractMobile AS mobile
-        FROM club c
-        LEFT JOIN cm_short_link csl ON c.clubId=csl.clubid
-        WHERE c.ADDTIME <![CDATA[ < ]]> '2017-01-01 00:00:00'
-        AND c.clubId > 1037
-        AND c.contractMobile IS NOT NULL
-        AND c.contractMobile NOT LIKE '%-%'
-        AND c.status !=94
-        AND csl.viewTime IS NULL
+        SELECT * FROM (
+                          SELECT
+                              DISTINCT a.clubID AS clubID,
+                                       u.userID AS userID,
+                                       a.contractMobile AS mobile
+                          FROM club a
+                                   LEFT JOIN USER u ON u.userID = a.userID
+                                   LEFT JOIN cm_svip_user csu ON csu.userId = u.userID
+                                   LEFT JOIN serviceprovider sp ON sp.serviceProviderID = a.spID
+                                   LEFT JOIN town b ON b.townID=a.townID
+                                   LEFT JOIN city c ON c.cityID=b.cityID
+                                   LEFT JOIN province d ON d.provinceID=c.provinceID
+                                   LEFT JOIN cm_organ_value_system covs ON a.userID = covs.userID
+                          WHERE
+                              covs.stage = 0 AND covs.delType = 1 AND a.status = 90
+                            AND  (covs.activeState = '新增用户' OR covs.activeState = '活跃用户' OR covs.activeState = '忠诚用户' OR covs.activeState = '沉默用户')
+                            AND u.registerTime BETWEEN '2021-01-01'  AND '2022-12-01'
+                            AND (u.userOrganizeID IN(0,1) OR u.clubStatus != 92)
+                          UNION
+                          SELECT
+                              DISTINCT a.clubID AS clubID,
+                                       u.userID AS userID,
+                                       a.contractMobile AS contractMobile
+                          FROM club a
+                                   LEFT JOIN USER u ON u.userID = a.userID
+                                   LEFT JOIN cm_svip_user csu ON csu.userId = u.userID
+                                   LEFT JOIN serviceprovider sp ON sp.serviceProviderID = a.spID
+                                   LEFT JOIN town b ON b.townID=a.townID
+                                   LEFT JOIN city c ON c.cityID=b.cityID
+                                   LEFT JOIN province d ON d.provinceID=c.provinceID
+                                   LEFT JOIN cm_organ_value_system covs ON a.userID = covs.userID
+                          WHERE
+                              covs.stage = 0 AND covs.delType = 1 AND a.status = 90
+                            AND a.userID IN ( SELECT userID FROM club WHERE userID IN (SELECT userID FROM cm_organ_value_system WHERE stage = 0 AND activeState LIKE '%不活跃用户%') AND NAME LIKE '%医%' )
+                            AND u.registerTime BETWEEN '2021-01-01'  AND '2022-12-01'
+                            AND (u.userOrganizeID IN(0,1) OR u.clubStatus != 92)
+                      ) b WHERE clubID NOT IN (11640,11365,9412,8866)
     </select>
-</mapper>
+</mapper>