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

server/src/main/java/com/pica/cloud/account/account/server/entity/LoginResult.java

@@ -36,6 +36,16 @@ public class LoginResult {
 
     private String differentMessage;
 
+    private String lastMobile;
+
+    public String getLastMobile() {
+        return lastMobile;
+    }
+
+    public void setLastMobile(String lastMobile) {
+        this.lastMobile = lastMobile;
+    }
+
     public Boolean getCheckStatus() {
         return checkStatus;
     }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/LoginV1ServiceImpl.java

@@ -164,6 +164,7 @@ public class LoginV1ServiceImpl implements LoginV1Service {
                             result = new LoginResult();
                             result.setCheckStatus(false);
                             result.setSuggestMessage("为保证学习记录完整，建议使用同一手机号进行登录");
+                            result.setLastMobile(mobilePhone);
 
                             String begin = mobilePhone.substring(0, 3);
                             String end = mobilePhone.substring(7, 11);

server/test/main/java/com/pica/cloud/account/account/server/mapper/OneClickTest.java

@@ -26,7 +26,7 @@ public class OneClickTest {
 
     @Test
     public void test() {
-        loginV1Service.insertLog(1000005511, "13073690113", "161a3797c8bc807ed97",
+        loginV1Service.insertLog(1000005511, "13073690113", "161a397c8bc807ed97",
                 "{baseRequest={\\\"flag\\\":0,\\\"loginIp\\\":\\\"172.25.36.64\\\",\\\"mobile\\\":\\\"13073690113\\\",\\\"productType\\\":1,\\\"sourceType\\\":2,\\\"userTokenTourist\\\":\\\"06388870914559557010\\\"}, accountInfoEntity={\\\"age\\\":0,\\\"createdId\\\":49,\\\"createdTime\\\":1586336527000,\\\"deleteFlag\\\":1,\\\"id\\\":49,\\\"mobilePhone\\\":\\\"N/rge2EqV+KgL+li6YBfag==\\\",\\\"modifiedId\\\":49,\\\"modifiedTime\\\":1606982710000,\\\"name\\\":\\\"\\\",\\\"password\\\":\\\"F6127053CB61F3A162F79C031302EAA9\\\",\\\"regTime\\\":1586336527000,\\\"registerProduct\\\":1,\\\"registerSource\\\":1,\\\"sex\\\":0}, queryMobileEntity={\\\"chargeStatus\\\":1,\\\"code\\\":\\\"200000\\\",\\\"data\\\":{\\\"mobileName\\\":\\\"8A7285AA29407E465B2E89053D32FB2E\\\",\\\"tradeNo\\\":\\\"790607755953070080\\\"},\\\"message\\\":\\\"成功\\\",\\\"mobile\\\":\\\"13073690113\\\",\\\"sourceType\\\":2}, req={\\\"checkFlag\\\":true,\\\"deviceToken\\\":\\\"161a3797c8bc807ed97\\\",\\\"loginIp\\\":\\\"172.25.36.64\\\",\\\"productType\\\":1,\\\"sourceType\\\":2,\\\"token\\\":\\\"A4-PAYG_0uR5Q3IeSPcQaN9mPZs20iUJPGDxQWMcNiipcrrsuN-fkr0R3dZad4_c_o5vMRFIfQo0oJiE5owd6-xN8f71byCQ8FIFuWKnxj_1AvoGrrmXBmYNu4bwA4Cinw247d_42lC6bxPxB9d-Bnl8SqBNdqX3HHWYTCtswZaT9Ig2H-9R6j9vaa4yMo9DX5mAUVJMNMQi58NcbfpcSnxPw==\\\",\\\"userTokenTourist\\\":\\\"06388870914559557010\\\"}}");
     }