Merge remote-tracking branch 'origin/features/order-iteration-20200418' into...

Merge remote-tracking branch 'origin/features/order-iteration-20200418' into features/order-iteration-20200418

src/main/java/cn/quantgroup/customer/model/order/ActiveApplyOrder.java

@@ -42,10 +42,8 @@ public class ActiveApplyOrder {
 
     private String termRepayment;
 
+    private String updateAt;
 
-
-
-
-
+    private String remark;
 
 }

src/main/java/cn/quantgroup/customer/model/order/ApplyOrder.java

@@ -14,7 +14,7 @@ import java.util.List;
 public class ApplyOrder {
     private List<ActiveApplyOrder> activeOrders = new ArrayList<>();
 
-    private List<InvalidApplyOrder> invalidOrders = new ArrayList<>();
+    private List<ActiveApplyOrder> invalidOrders = new ArrayList<>();
 
     /**
      * 近期状况

src/main/java/cn/quantgroup/customer/service/impl/UserServiceImpl.java

@@ -6,9 +6,7 @@ import cn.quantgroup.customer.enums.ErrorCodeEnum;
 import cn.quantgroup.customer.exception.BusinessException;
 import cn.quantgroup.customer.model.Tuple;
 import cn.quantgroup.customer.model.kaordermapping.LoanOrderMapping;
-import cn.quantgroup.customer.model.order.ActiveApplyOrder;
 import cn.quantgroup.customer.model.order.ApplyOrder;
-import cn.quantgroup.customer.model.order.InvalidApplyOrder;
 import cn.quantgroup.customer.model.xyqbuser.UserBasicInfo;
 import cn.quantgroup.customer.model.xyqbuser.UserCombination;
 import cn.quantgroup.customer.repo.UserRepo;
@@ -47,7 +45,6 @@ import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 import static cn.quantgroup.customer.constant.Constant.GSON;
 
@@ -387,7 +384,7 @@ public class UserServiceImpl implements IUserService {
             result.setValue("2");
             return result;
         }
-        result.setValue("只能使用渠道号和渠道订单号组合查询");
+        result.setValue("只能通过单一条件查询");
         return result;
     }