Merge branch 'dev' into test

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamMember.java

@@ -108,4 +108,6 @@ public class AdamMember implements Serializable {
     private LocalDateTime createdAt;
 
     private LocalDateTime updatedAt;
+
+    private String comment;
 }

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamMemberCode.java

@@ -66,6 +66,8 @@ public class AdamMemberCode {
     private LocalDateTime useAt;
 
     private LocalDateTime createdAt;
+
     private LocalDateTime updatedAt;
 
+    private String comment;
 }

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamMemberPrice.java

@@ -70,4 +70,6 @@ public class AdamMemberPrice implements Serializable {
      * 更新时间
      */
     private LocalDateTime updatedAt;
+
+    private String comment;
 }

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamUser.java

@@ -38,6 +38,11 @@ public class AdamUser implements Serializable {
      */
     private Integer state;
 
+    /**
+     * 完善信息进度:0-未完善,1-已完善
+     */
+    private Integer isComplete;
+
     private LocalDateTime createdAt;
 
     private LocalDateTime updatedAt;

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamUserMember.java

@@ -28,4 +28,6 @@ public class AdamUserMember {
     private LocalDateTime createdAt;
 
     private LocalDateTime updatedAt;
+
+    private String comment;
 }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java

@@ -25,8 +25,8 @@ public class OrderUtils {
 
     @Autowired
     private DataUtils dataUtils;
-    @Value("${liquidnet.adam.url}")
-    private String adamUrl;
+//    @Value("${liquidnet.adam.url}")
+//    private String adamUrl;
     @Autowired
     private RedisUtil redisUtil;
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMUserInformationProcessor.java

@@ -104,6 +104,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
                         String mobile = row.getString(2);
                         user.setMobile(mobile);
                         LocalDateTime createdAt = row.getLocalDateTime(10), updatedAt = row.getLocalDateTime(11);
+                        user.setIsComplete(row.getInt(12));
                         user.setCreatedAt(createdAt);
                         user.setUpdatedAt(updatedAt);
                         user.setState(1);
@@ -134,7 +135,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
                         vo.setBackground(userInfo.getBackground());
                         vo.setCreateAt(user.getCreatedAt());
                         vo.setUpdatedAt(user.getUpdatedAt());
-                        vo.setIsComplete(row.getInt(12));
+                        vo.setIsComplete(user.getIsComplete());
                         vo.setQrCode(userInfo.getQrCode());
 
                         userList.add(user);