Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/order/entity/api/yangguang/constants/YgUseNatureCode.java

@@ -6,17 +6,16 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum YgUseNatureCode {
-    UNC_01("8D", "非营业个人"),
-    UNC_02("8A", "家庭自用"),
-    UNC_03("8B", "非营业企业"),
-    UNC_04("8F", "非营业事业团体"),
-    UNC_05("8E", "非营业党政机关"),
+    UNC_08("8D", "非营业个人"),
+    UNC_05("8A", "家庭自用"),
+    UNC_07("8B", "非营业企业"),
+//    UNC_05("8E", "非营业党政机关"),
     UNC_06("8G", "教练"),
-    UNC_07("9B", "营业城市公交"),
-    UNC_08("9C", "营业公路客运"),
-    UNC_09("9D", "营业货运"),
+    UNC_02("9B", "营业城市公交"),
+    UNC_03("9C", "营业公路客运"),
+    UNC_04("9D", "营业货运"),
     UNC_10("9E", "营业旅游客运"),
-    UNC_11("9F", "营业出租"),
+    UNC_01("9F", "营业出租"),
     UNC_12("9J", "营业"),
 
     UNC_13("9G", "营业租赁"),

src/main/java/com/ydtech/modules/order/entity/api/yangguang/request/YangGuangAccuracyCalculateRequest.java

@@ -708,9 +708,13 @@ public class YangGuangAccuracyCalculateRequest extends YangGuangBaseRequest{
 //            this.CompleteKerbmass = carInfoVo.getVehicleweight();
 //            this.TonCount = String.valueOf(carInfoVo.limitLoadTon());
             this.LicenseType = carInfoVo.getLicenseTypeCode();
-            this.VehicleType = carInfoVo.getCimodelclass();
+            if (carInfoVo.getCimodelclass().equals("A1")) {
+                this.VehicleType = "H0";
+            } else {
+                this.VehicleType = carInfoVo.getCimodelclass();
+            }
             // 车辆使用性质代码
-            YgUseNatureCode ygUseNatureCode1 = Enum.valueOf(YgUseNatureCode.class, YgUseNatureCode.TITLE + carInfoVo.getCarnature());
+            YgUseNatureCode ygUseNatureCode1 = Enum.valueOf(YgUseNatureCode.class, YgUseNatureCode.TITLE + carInfoVo.getVehicleUse());
             this.UseNatureCode = ygUseNatureCode1.getCode();
             this.EnrollDate = carInfoVo.getRegisterDate();
             this.LicenseNo = carInfoVo.getLicenseNo();

src/main/java/com/ydtech/modules/order/service/impl/YangGuangOrderApiServiceImpl.java

@@ -574,35 +574,39 @@ public class YangGuangOrderApiServiceImpl implements YangGuangOrderApiService {
         String productid = insAreaCompany.getProductid();
         //单交
         if (productid.equals("0330")) {
-            YangGuangAutoWriteOffRequest yangGuangAutoWriteOffRequest = new YangGuangAutoWriteOffRequest(ygConfigureParameters, insAreaCompany.getJqpolicyno());
+            YangGuangAutoWriteOffRequest yangGuangAutoWriteOffRequest = new YangGuangAutoWriteOffRequest(ygConfigureParameters, insAreaCompany.getJqapplyno());
             YangGuangAutoWriteOffResponse yangGuangAutoWriteOffResponse = yangGuangRequestApiComponents.autoWriteOff(yangGuangAutoWriteOffRequest);
             if (yangGuangAutoWriteOffResponse.getErrorCode().equals("0")) {
-                HttpResult.ok(yangGuangAutoWriteOffResponse);
+                insAreaCompany.setOrderstatus(InsOrderStatusEnum.QUOTE_ING.getCode());
+                insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
+                return true;
             }
-            return false;
         }
         // 单商
         if (productid.equals("034001")) {
-            YangGuangAutoWriteOffRequest yangGuangAutoWriteOffRequest = new YangGuangAutoWriteOffRequest(ygConfigureParameters, insAreaCompany.getSypolicyno());
+            YangGuangAutoWriteOffRequest yangGuangAutoWriteOffRequest = new YangGuangAutoWriteOffRequest(ygConfigureParameters, insAreaCompany.getSyapplyno());
             YangGuangAutoWriteOffResponse yangGuangAutoWriteOffResponse = yangGuangRequestApiComponents.autoWriteOff(yangGuangAutoWriteOffRequest);
             if (yangGuangAutoWriteOffResponse.getErrorCode().equals("0")) {
-                HttpResult.ok(yangGuangAutoWriteOffResponse);
+                insAreaCompany.setOrderstatus(InsOrderStatusEnum.QUOTE_ING.getCode());
+                insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
+                return true;
             }
-            return false;
         }
             //交商同保
         if (insAreaCompany.getJqpolicyno() != null && insAreaCompany.getSypolicyno() != null && !insAreaCompany.getJqpolicyno().equals("") && !insAreaCompany.getSypolicyno().equals("")) {
-            YangGuangAutoWriteOffRequest yangGuangAutoWriteOffRequestJq = new YangGuangAutoWriteOffRequest(ygConfigureParameters, insAreaCompany.getJqpolicyno());
+            YangGuangAutoWriteOffRequest yangGuangAutoWriteOffRequestJq = new YangGuangAutoWriteOffRequest(ygConfigureParameters, insAreaCompany.getJqapplyno());
             YangGuangAutoWriteOffResponse yangGuangAutoWriteOffResponseJq = yangGuangRequestApiComponents.autoWriteOff(yangGuangAutoWriteOffRequestJq);
-            YangGuangAutoWriteOffRequest yangGuangAutoWriteOffRequestSy = new YangGuangAutoWriteOffRequest(ygConfigureParameters, insAreaCompany.getSypolicyno());
+            YangGuangAutoWriteOffRequest yangGuangAutoWriteOffRequestSy = new YangGuangAutoWriteOffRequest(ygConfigureParameters, insAreaCompany.getSyapplyno());
             YangGuangAutoWriteOffResponse yangGuangAutoWriteOffResponseSy = yangGuangRequestApiComponents.autoWriteOff(yangGuangAutoWriteOffRequestSy);
             if (yangGuangAutoWriteOffResponseJq.getErrorCode().equals("0") && yangGuangAutoWriteOffResponseSy.getErrorCode().equals("0")) {
-                HttpResult.ok("撤单成功");
+                insAreaCompany.setOrderstatus(InsOrderStatusEnum.QUOTE_ING.getCode());
+                insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
+                return true;
             } else {
                 return false;
             }
         }
-        return false;
+        return true;
     }
 
     public QuoteRespVo getQuoteRespVo (YangGuangAccuracyCalculateResponse yangGuangAccuracyCalculateResponse, BaseQuoteInfoVo yaQuoteInfoVo, List<YgQuoteAccidentVo> accidentalDrivingVo, boolean isEnergy) {