|
@@ -1,14 +1,14 @@
|
|
|
-package com.ydtech.modules.order.components.zj;
|
|
|
|
|
|
|
+package com.ydtech.modules.order.components.zijin;
|
|
|
|
|
|
|
|
|
|
|
|
|
import com.ydtech.constants.InsuranceEnum;
|
|
import com.ydtech.constants.InsuranceEnum;
|
|
|
import com.ydtech.exception.SystemException;
|
|
import com.ydtech.exception.SystemException;
|
|
|
-import com.ydtech.modules.order.entity.api.zj.constants.enums.CalculateFlagEnum;
|
|
|
|
|
-import com.ydtech.modules.order.entity.api.zj.constants.enums.ResultEnum;
|
|
|
|
|
-import com.ydtech.modules.order.entity.api.zj.request.CalculatePremiumRequest;
|
|
|
|
|
-import com.ydtech.modules.order.entity.api.zj.request.ModelQueryRequest;
|
|
|
|
|
-import com.ydtech.modules.order.entity.api.zj.request.QueryActualValueRequest;
|
|
|
|
|
-import com.ydtech.modules.order.entity.api.zj.response.CalculatePremiumResponse;
|
|
|
|
|
|
|
+import com.ydtech.modules.order.entity.api.zijin.constants.enums.CalculateFlagEnum;
|
|
|
|
|
+import com.ydtech.modules.order.entity.api.zijin.constants.enums.ResultEnum;
|
|
|
|
|
+import com.ydtech.modules.order.entity.api.zijin.request.CalculatePremiumRequest;
|
|
|
|
|
+import com.ydtech.modules.order.entity.api.zijin.request.ModelQueryRequest;
|
|
|
|
|
+import com.ydtech.modules.order.entity.api.zijin.request.QueryActualValueRequest;
|
|
|
|
|
+import com.ydtech.modules.order.entity.api.zijin.response.CalculatePremiumResponse;
|
|
|
import com.ydtech.modules.order.utils.InsuranceLog;
|
|
import com.ydtech.modules.order.utils.InsuranceLog;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.context.annotation.Lazy;
|
|
import org.springframework.context.annotation.Lazy;
|
|
@@ -35,7 +35,7 @@ public class ZijinDuplicateInsuranceComponents extends ResponseMessageAbstractHa
|
|
|
|
|
|
|
|
public static final String JQ = "交强险";
|
|
public static final String JQ = "交强险";
|
|
|
|
|
|
|
|
- public static final String SY_REGEX = "商业险.+?终保日期:(.+?);";
|
|
|
|
|
|
|
+ public static final String SY_REGEX = "商业险.+?终保日期:(\\d+)";
|
|
|
|
|
|
|
|
public static final String SY = "商业险";
|
|
public static final String SY = "商业险";
|
|
|
|
|
|
|
@@ -80,7 +80,7 @@ public class ZijinDuplicateInsuranceComponents extends ResponseMessageAbstractHa
|
|
|
* @param regex 正则
|
|
* @param regex 正则
|
|
|
* @return 终保日期
|
|
* @return 终保日期
|
|
|
*/
|
|
*/
|
|
|
- public String getEndDate(String rtnMsg, String regex) {
|
|
|
|
|
|
|
+ public static String getEndDate(String rtnMsg, String regex) {
|
|
|
String endDate = getTheExpiryDate(rtnMsg, regex);
|
|
String endDate = getTheExpiryDate(rtnMsg, regex);
|
|
|
if (!endDate.isEmpty()) {
|
|
if (!endDate.isEmpty()) {
|
|
|
return endDate;
|
|
return endDate;
|