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,10 @@ public class BaseApi {
     /**
      * 老用户发短信临时接口
      */
-//    @GetMapping("/getOld")
-//    public void getOldUser() {
-//        remoteCallService.getOldUser();
-//    }
+    @GetMapping("/getOld")
+    public void getOldUser() {
+        remoteCallService.getOldUser();
+        remoteCallService.getOldUserTow();
+    }
 }
 

src/main/java/com/caimei365/order/mapper/MessagePushMapper.java

@@ -34,6 +34,7 @@ public interface MessagePushMapper {
     void updateSmsSendCount(int markId, int count);
 
     List<PushMessageUserVo> findOldUser();
+    List<PushMessageUserVo> findOldUserTow();
 
     void insertNewLink(PushMessageUserVo p);
 }

src/main/java/com/caimei365/order/service/RemoteCallService.java

@@ -59,4 +59,6 @@ public interface RemoteCallService {
     String productSaleUpdate(String productInfo);
 
     void getOldUser();
+
+    void getOldUserTow();
 }