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

blade-auth/src/main/java/org/springblade/auth/verification/verificationController.java

@@ -102,7 +102,7 @@ public class verificationController {
 				return R.fail("短信发送失败，请稍后重试");
 			}
 		}
-		redisUtils.set(CacheNames.APP_LOGIN_CODE_KEY + redisKey, code, NumberEnum.FIVE_HUNDRED.number);
+		redisUtils.set(CacheNames.APP_LOGIN_CODE_KEY + redisKey, code, NumberEnum.ONE_HUNDRED_AND_EIGHTY.number);
 		return R.success("发送成功，请留意手机短信");
 	}
 

blade-common/src/main/java/org/springblade/common/enums/NumberEnum.java

@@ -67,6 +67,11 @@ public enum NumberEnum {
 	FIFTEEN(15),
 
 	/**
+	 * 180
+	 */
+	ONE_HUNDRED_AND_EIGHTY(180),
+
+	/**
 	 * 300
 	 */
 	THREE_HUNDRED(300),

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

@@ -104,13 +104,8 @@ public class ShopAppTireInsuranceRegisterController extends BladeController {
 		LambdaQueryWrapper<ShopAppTireInsuranceRegister> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(ShopAppTireInsuranceRegister::getIsDeleted, 0)
 			.eq(ObjectUtils.isNotNull(appTireInsuranceRegister.getStatus()), ShopAppTireInsuranceRegister::getStatus, appTireInsuranceRegister.getStatus())
-			.like(ObjectUtils.isNotNull(appTireInsuranceRegister.getConsumerName()), ShopAppTireInsuranceRegister::getConsumerName, appTireInsuranceRegister.getConsumerName())
-			.like(ObjectUtils.isNotNull(appTireInsuranceRegister.getConsumerPhone()), ShopAppTireInsuranceRegister::getConsumerPhone, appTireInsuranceRegister.getConsumerPhone())
-			.like(ObjectUtils.isNotNull(appTireInsuranceRegister.getInsuranceNo()), ShopAppTireInsuranceRegister::getInsuranceNo, appTireInsuranceRegister.getInsuranceNo())
-			.like(ObjectUtils.isNotNull(appTireInsuranceRegister.getTyreSpecs()), ShopAppTireInsuranceRegister::getTyreSpecs, appTireInsuranceRegister.getTyreSpecs())
 			.and(ObjectUtils.isNotNull(appTireInsuranceRegister.getSearchCriteria()), i -> i.like(ShopAppTireInsuranceRegister::getConsumerName, appTireInsuranceRegister.getSearchCriteria()).or()
 				.like(ShopAppTireInsuranceRegister::getConsumerPhone, appTireInsuranceRegister.getSearchCriteria()).or()
-				.like(ShopAppTireInsuranceRegister::getTyreSpecs, appTireInsuranceRegister.getSearchCriteria()).or()
 				.like(ShopAppTireInsuranceRegister::getVehicleNumber, appTireInsuranceRegister.getSearchCriteria()).or()
 				.like(ShopAppTireInsuranceRegister::getInsuranceNo, appTireInsuranceRegister.getSearchCriteria()))
 			.orderByDesc(ShopAppTireInsuranceRegister::getCreateTime);

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

@@ -402,8 +402,8 @@ public class ShopAppTireInsuranceRegisterServiceImpl extends ServiceImpl<ShopApp
 		claim.setAuditStatus(0);                                            // 审核状态
 		claim.setSubmitTime(new Date());                                    // 提交时间
 		claim.setClaimReason("");
-		claim.setConsumerName(tireInsuranceRegister.getConsumerName());
-		claim.setConsumerPhone(tireInsuranceRegister.getConsumerPhone());
+		claim.setConsumerName(insuranceRegister.getConsumerName());
+		claim.setConsumerPhone(insuranceRegister.getConsumerPhone());
 		claim.setBrandItem(appTireInsuranceRegister.getBrandItem());
 		claim.setBrandName(appTireInsuranceRegister.getBrandName());
 
@@ -418,7 +418,6 @@ public class ShopAppTireInsuranceRegisterServiceImpl extends ServiceImpl<ShopApp
 		claim.setSourceId(AuthUtil.getUserId());
 		claim.setSourceCode("");
 		claim.setSourceName(AuthUtil.getUserName());
-		claim.setConsumerName(AuthUtil.getUserName());
 		// 8. 保存理赔申请信息
 		bladeClaimService.save(claim);
 		ShopAppTireInsuranceRecord tireInsuranceRecord = new ShopAppTireInsuranceRecord();

blade-service/gubersail-shop-app/src/main/java/com/gubersail/shop/app/shoppingCart/service/impl/ShopAppShoppingCartServiceImpl.java

@@ -135,7 +135,7 @@ public class ShopAppShoppingCartServiceImpl extends ServiceImpl<ShopAppShoppingC
 			order.setXcxStatus("待发货");
 			order.setCreateTime(new Date());
 			order.setCreateUser(AuthUtil.getUserId());
-			order.setCreateDept(Long.getLong(AuthUtil.getDeptId()));
+			order.setCreateDept(finalCorpsDesc.getCreateDept());
 			orderService.save(order);
 			for (ShopAppShoppingCart item : list) {
 				ids.append(order.getId()).append(",");
@@ -148,7 +148,7 @@ public class ShopAppShoppingCartServiceImpl extends ServiceImpl<ShopAppShoppingC
 				orderItems.setId(null);
 				orderItems.setSendNum(new BigDecimal("0.00"));
 				orderItems.setCreateUser(bladeUser.getUserId());
-				orderItems.setCreateDept(order.getCreateDept());
+				orderItems.setCreateDept(finalCorpsDesc.getCreateDept());
 				orderItems.setCreateTime(new Date());
 				orderItems.setPid(order.getId());
 				orderItems.setTenantId(bladeUser.getTenantId());
@@ -266,7 +266,7 @@ public class ShopAppShoppingCartServiceImpl extends ServiceImpl<ShopAppShoppingC
 			order.setSrcOrdNo(billNo);
 			order.setCreateUser(AuthUtil.getUserId());
 			order.setCreateTime(new Date());
-			order.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+			order.setCreateDept(finalCorpsDesc.getCreateDept());
 			order.setTenantId(AuthUtil.getTenantId());
 			order.setCustomerId(finalCorpsDesc.getId());
 			order.setCustomerName(finalCorpsDesc.getCname());
@@ -299,7 +299,7 @@ public class ShopAppShoppingCartServiceImpl extends ServiceImpl<ShopAppShoppingC
 				orderItems.setId(null);
 				orderItems.setSendNum(new BigDecimal("0.00"));
 				orderItems.setCreateUser(AuthUtil.getUserId());
-				orderItems.setCreateDept(order.getCreateDept());
+				orderItems.setCreateDept(finalCorpsDesc.getCreateDept());
 				orderItems.setCreateTime(new Date());
 				orderItems.setPid(order.getId());
 				orderItems.setTenantId(AuthUtil.getTenantId());
@@ -393,7 +393,7 @@ public class ShopAppShoppingCartServiceImpl extends ServiceImpl<ShopAppShoppingC
 			order.setSrcOrdNo(billNo);
 			order.setCreateUser(AuthUtil.getUserId());
 			order.setCreateTime(new Date());
-			order.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+			order.setCreateDept(finalCorpsDesc.getCreateDept());
 			order.setTenantId(AuthUtil.getTenantId());
 			order.setCustomerId(finalCorpsDesc.getId());
 			order.setCustomerName(finalCorpsDesc.getCname());
@@ -429,7 +429,7 @@ public class ShopAppShoppingCartServiceImpl extends ServiceImpl<ShopAppShoppingC
 				orderItems.setId(null);
 				orderItems.setSendNum(new BigDecimal("0.00"));
 				orderItems.setCreateUser(AuthUtil.getUserId());
-				orderItems.setCreateDept(order.getCreateDept());
+				orderItems.setCreateDept(finalCorpsDesc.getCreateDept());
 				orderItems.setCreateTime(new Date());
 				orderItems.setPid(order.getId());
 				orderItems.setTenantId(AuthUtil.getTenantId());