wks 2 лет назад
Родитель
Сommit
7bc38ccb88

+ 9 - 1
src/main/java/com/ydtech/modules/order/components/gouren/GuorenDuplicateInsuranceComponent.java

@@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.ObjectUtils;
 
 import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -85,7 +86,14 @@ public class GuorenDuplicateInsuranceComponent {
                 String string = dateFormatMap.get(startDate.length());
                 SimpleDateFormat dateFormat = new SimpleDateFormat(string);
                 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                return simpleDateFormat.format(dateFormat.parse(startDate));
+
+                Date parse = dateFormat.parse(startDate);
+                Date start = new Date();
+
+                if (start.after(parse)) {
+                    return simpleDateFormat.format(parse);
+                }
+
             } catch (Exception e) {
                 throw new SystemException(message);
             }

+ 1 - 1
src/main/java/com/ydtech/modules/order/entity/api/huatai/request/HuaTaiQuotedPriceRequest.java

@@ -310,7 +310,7 @@ public class HuaTaiQuotedPriceRequest extends HuaTaiBaseRequest {
                     } else {
                         this.specialCarFlag = "";
                     }
-
+                    this.Power = carInfoVo.getPowerScale();
                     if (carInfoVo.isTransferFlagBi()) {
                         this.chgOwnerFlag = "1";
                         this.transferDate = carInfoVo.getTransferDate() + " " + TimeConstants.START_TIME;