1.门店轮胎保增加胎号字段及逻辑修改

blade-service-api/gubersail-shop-app-api/src/main/java/com/gubersail/shop/app/api/insurance/entity/ShopAppTireInsuranceFiles.java

@@ -120,6 +120,16 @@ public class ShopAppTireInsuranceFiles implements Serializable {
 	 */
 	@ApiModelProperty(value = "理赔状态")
 	private String claimStatus;
+	/**
+	 * 规格型号
+	 */
+	@ApiModelProperty(value = "规格型号")
+	private String tyreSpecs;
+	/**
+	 * 胎号/轮胎宝编号
+	 */
+	@ApiModelProperty(value = "胎号/轮胎宝编号")
+	private String tyreNo;
 
 
 }

blade-service-api/gubersail-shop-app-api/src/main/java/com/gubersail/shop/app/api/insurance/vo/ShopAppTireInsuranceRegisterVO.java

@@ -97,4 +97,13 @@ public class ShopAppTireInsuranceRegisterVO extends ShopAppTireInsuranceRegister
 	 */
 	private Long notInEffect;
 
+	/**
+	 * 胎号/轮胎宝编号
+	 */
+	private String tyreNo;
+	/**
+	 * 规格型号
+	 */
+	private String tyreSpecs;
+
 }

blade-service/gubersail-shop-app/src/main/java/com/gubersail/shop/app/claim/service/impl/ShopAppClaimServiceImpl.java

@@ -136,7 +136,7 @@ public class ShopAppClaimServiceImpl extends ServiceImpl<ShopAppClaimMapper, Sho
 				.last("LIMIT 1"));
 			Integer tireQuantity = shopAppClaimList.stream().map(ShopAppClaim::getTireQuantity).filter(Objects::nonNull)
 				.mapToInt(Integer::intValue).sum();
-			if (ObjectUtils.isNotNull(claim.getTireQuantity())) {
+			if (ObjectUtils.isNotNull(claim.getTireQuantity()) && insuranceRegister != null && ObjectUtils.isNotNull(insuranceRegister.getTireQuantity())) {
 				if ((tireQuantity + claim.getTireQuantity()) > insuranceRegister.getTireQuantity()) {
 					throw new RuntimeException("已理赔数量：" + tireQuantity + "+本次理赔数量：" + claim.getTireQuantity() + "大于轮胎保数量！");
 				}

blade-service/gubersail-shop-app/src/main/java/com/gubersail/shop/app/insurance/controller/ShopAppTireInsuranceRegisterController.java

@@ -269,7 +269,7 @@ public class ShopAppTireInsuranceRegisterController extends BladeController {
 		JSONObject result = BaiduOcrUtils.recognizeLicensePlate(file);
 		if (result.has("error_code")) {
 			int errorCode = result.getInt("error_code");
-			return R.fail("识别失败，错误信息：" + BaiDuOcrEnum.getDescriptionByCode(errorCode));
+			return R.fail(BaiDuOcrEnum.getDescriptionByCode(errorCode));
 		}
 
 		// 解析车牌识别结果

blade-service/gubersail-shop-app/src/main/java/com/gubersail/shop/app/insurance/service/impl/ShopAppTireInsuranceRegisterServiceImpl.java

@@ -238,7 +238,7 @@ public class ShopAppTireInsuranceRegisterServiceImpl extends ServiceImpl<ShopApp
 			}
 			tireInsuranceFilesService.saveOrUpdateBatch(appTireInsuranceRegister.getTireInsuranceFilesList());
 		}
-		CarOwner carOwner = carOwnerService.getOne(new LambdaQueryWrapper<CarOwner>()
+		/*CarOwner carOwner = carOwnerService.getOne(new LambdaQueryWrapper<CarOwner>()
 			.eq(CarOwner::getIsDeleted, 0)
 			.eq(CarOwner::getCname, tireInsuranceRegister.getConsumerName())
 			.eq(CarOwner::getPhone, tireInsuranceRegister.getConsumerPhone())
@@ -281,7 +281,7 @@ public class ShopAppTireInsuranceRegisterServiceImpl extends ServiceImpl<ShopApp
 				carOwner.setUserId(userTemp.getData().getId());
 			}
 			carOwnerService.save(carOwner);
-		}
+		}*/
 		// 4. 返回处理结果
 		return R.data(appTireInsuranceRegister);
 	}
@@ -359,8 +359,8 @@ public class ShopAppTireInsuranceRegisterServiceImpl extends ServiceImpl<ShopApp
 		claim.setClaimSourceType(2);                                        // 理赔来源类型
 		claim.setVehicleNumber(tireInsuranceRegister.getVehicleNumber());   // 车牌号
 		claim.setTireQuantity(1);     // 轮胎数量
-		claim.setTyreNo(tireInsuranceRegister.getInsuranceNo());            // 胎号/轮胎宝编号
-		claim.setTyreSpecs(tireInsuranceRegister.getTyreSpecs());           // 规格型号
+		claim.setTyreNo(appTireInsuranceRegister.getTyreNo());            // 胎号/轮胎宝编号
+		claim.setTyreSpecs(appTireInsuranceRegister.getTyreSpecs());           // 规格型号
 		claim.setAuditStatus(0);                                            // 审核状态
 		claim.setSubmitTime(new Date());                                    // 提交时间
 		claim.setClaimReason("");