Merge remote-tracking branch 'origin/master'

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/OrderInitManager.java

@@ -228,9 +228,11 @@ public class OrderInitManager extends AbstractOrderManager<OrderInitRequest> {
                 throw newBusinessException("当前车辆存在未完成订单，订单编号："+order.getOrderNo());
             }
         }
-        IssueOrderinfo qdOrder = orderInfoRepo.findByQdOrderNo(request.getQdOrderNo());
-        if (qdOrder != null) {
-            throw newBusinessException("渠道订单号已存在:"+request.getQdOrderNo());
+        if (SourceType.CHANNEL.equals(request.getSourceType())) {
+            IssueOrderinfo qdOrder = orderInfoRepo.findByQdOrderNo(request.getQdOrderNo());
+            if (qdOrder != null) {
+                throw newBusinessException("渠道订单号已存在:" + request.getQdOrderNo());
+            }
         }
     }
 

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/UserUploadManager.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.ias.manager.order;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
+import cn.com.taiji.common.pub.TimeTools;
 import cn.com.taiji.core.entity.basic.QtkCustomerInfo;
 import cn.com.taiji.core.entity.dict.basic.Gender;
 import cn.com.taiji.core.entity.dict.basic.IdType;
@@ -288,13 +289,14 @@ public class UserUploadManager extends AbstractOrderManager<UserUploadRequest> {
         if ("长期".equals(vldStr)) {
             return null;
         }
+        LocalDate vld = null;
         try {
-            LocalDate vld = MyTimeTools.strToDate("yyyyMMdd", vldStr);
-            throwBisExceptionOn(LocalDate.now().isAfter(vld), "当前证件已过期");
-            return vld;
+            vld = LocalDate.parse(vldStr, TimeTools.yyyyMMdd);
         } catch (Exception e) {
             throw newBusinessException("证件有效期格式错误");
         }
+        throwBisExceptionOn(LocalDate.now().isAfter(vld), "当前证件已过期");
+        return vld;
     }
 
 }