Merge branch 'ecp' into dev

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

@@ -101,9 +101,9 @@ public class ShopAppTireInsuranceRegister implements Serializable {
 	@ApiModelProperty(value = "更新时间(系统继承)")
 	private Date updateTime;
 	/**
-	 * 状态 0录入，1已提交（在保），2受理中（理赔提交），3已通过（工厂审核通过）
+	 * 状态 0录入，1在保
 	 */
-	@ApiModelProperty(value = "状态 0录入，1已提交（在保），2受理中（理赔提交），3已通过（工厂审核通过）")
+	@ApiModelProperty(value = "状态 0录入，1在保")
 	private Integer status;
 	/**
 	 * 是否已删除(系统继承)

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

@@ -38,4 +38,9 @@ public class ShopAppTireInsuranceRegisterVO extends ShopAppTireInsuranceRegister
 
 	private List<ShopAppTireInsuranceRecord> tireInsuranceRecordList;
 
+	/**
+	 * 生成理赔记录-理赔单ID
+	 */
+	private Long claimId;
+
 }

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/corp/mapper/CorpsTypeMapper.java

@@ -47,7 +47,7 @@ public interface CorpsTypeMapper extends BaseMapper<PjCorpsType> {
 	 * @param tenantId
 	 * @return
 	 */
-	List<CorpsTypeVO> tree(String tenantId, String corpType, Long salesCompanyId);
+	List<CorpsTypeVO> tree(String tenantId, String corpType, String createDept);
 
 	/**
 	 * 懒加载

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/corp/mapper/CorpsTypeMapper.xml

@@ -134,8 +134,8 @@
         <if test="tenantId!=null and tenantId!=''">
             and tenant_id = #{tenantId}
         </if>
-        <if test="salesCompanyId!=null">
-            and sales_company_id = #{salesCompanyId}
+        <if test="createDept!=null">
+            and create_dept = #{createDept}
         </if>
         ORDER BY sort
     </select>
@@ -172,7 +172,7 @@
             and dept.cname = #{param4}
         </if>
         <if test="param5!=null and param5!=''">
-            and dept.sales_company_id = #{param5}
+            and dept.create_dept = #{param5}
         </if>
         ORDER BY dept.sort
     </select>

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/corp/service/impl/CorpsDescServiceImpl.java

@@ -92,8 +92,10 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 					corpsTypeList.stream().filter(e -> id.equals(e.getId() + "")).findFirst()
 						.ifPresent(corpsType -> corpsTypeName.append(corpsType.getCname()).append(","));
 				}
-				String corpsName = corpsTypeName.substring(0, corpsTypeName.length() - 1);
-				corpsDescVO.setCorpsTypeName(corpsName);
+				if (ObjectUtils.isNotNull(corpsTypeName)){
+					String corpsName = corpsTypeName.substring(0, corpsTypeName.length() - 1);
+					corpsDescVO.setCorpsTypeName(corpsName);
+				}
 			}
 		}
 		return corpsDescVO;

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/corp/service/impl/CorpsTypeServiceImpl.java

@@ -120,8 +120,11 @@ public class CorpsTypeServiceImpl extends ServiceImpl<CorpsTypeMapper, PjCorpsTy
 		if (StringUtils.isBlank(tenantId)) {
 			tenantId = SecureUtil.getTenantId();
 		}
-		return ForestNodeMerger.merge(baseMapper.tree(tenantId, corpType, null));
-
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			return ForestNodeMerger.merge(baseMapper.tree(tenantId, corpType, AuthUtil.getDeptId()));
+		}else{
+			return ForestNodeMerger.merge(baseMapper.tree(tenantId, corpType,null));
+		}
 	}
 
 	@Override
@@ -139,7 +142,11 @@ public class CorpsTypeServiceImpl extends ServiceImpl<CorpsTypeMapper, PjCorpsTy
 		if (StringUtils.isBlank(tenantId)) {
 			tenantId = SecureUtil.getTenantId();
 		}
-		return baseMapper.lazyTree(tenantId, parentId, corpType, cname, null);
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			return baseMapper.lazyTree(tenantId, parentId, corpType, cname, AuthUtil.getDeptId());
+		}else{
+			return baseMapper.lazyTree(tenantId, parentId, corpType, cname, null);
+		}
 	}
 
 	@Override

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/fc/customer/impl/FcCustomerDescServiceImpl.java

@@ -281,7 +281,7 @@ public class FcCustomerDescServiceImpl extends ServiceImpl<FcCustomerDescMapper,
 		if (!CollectionUtils.isEmpty(corpsDesc.getCorpsAddrList())) {
 			long count = corpsDesc.getCorpsAddrList().stream().filter(e -> "1".equals(e.getDefaultAddres())).count();
 			if (count != 1) {
-				throw new RuntimeException("默认地址唯一");
+				throw new RuntimeException("开启默认地址");
 			}
 			corpsDesc.getCorpsAddrList().forEach(addr -> {
 				addr.setPid(pId);

blade-service/gubersail-dealer-app/src/main/java/com/gubersail/app/corp/controller/AppCorpsDescController.java

@@ -6,17 +6,11 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.gubersail.app.api.corps.entity.AppCorpsLabel;
-import com.gubersail.app.api.corps.entity.AppPjCorpsDesc;
-import com.gubersail.app.api.corps.entity.AppPjCorpsFiles;
-import com.gubersail.app.api.corps.entity.AppPjCorpsType;
+import com.gubersail.app.api.corps.entity.*;
 import com.gubersail.app.api.corps.vo.AppCorpsDescVO;
 import com.gubersail.app.api.goods.entity.AppBrandDesc;
 import com.gubersail.app.api.storage.entity.AppStorageDesc;
-import com.gubersail.app.corp.service.IAppCorpsDescService;
-import com.gubersail.app.corp.service.IAppCorpsFilesService;
-import com.gubersail.app.corp.service.IAppCorpsLabelService;
-import com.gubersail.app.corp.service.IAppCorpsTypeService;
+import com.gubersail.app.corp.service.*;
 import com.gubersail.app.goods.service.IAppBrandDescService;
 import com.gubersail.app.storage.service.IAppStorageDescService;
 import com.gubersail.app.wrapper.AppCorpsWrapper;
@@ -47,6 +41,8 @@ import java.util.stream.Collectors;
 public class AppCorpsDescController extends BladeController {
 
 	private final IAppCorpsDescService corpsDescService;
+	private final IAppCorpsAddrService corpsAddrService;
+	private final IAppCorpsAttnService corpsAttnService;
 	private final IAppCorpsTypeService corpsTypeService;
 	private final IAppCorpsLabelService corpsLabelService;
 	private final IAppCorpsFilesService corpsFilesService;
@@ -217,5 +213,30 @@ public class AppCorpsDescController extends BladeController {
 		return R.data(list);
 	}
 
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@Transactional(rollbackFor = Exception.class)
+	@RepeatSubmit
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		List<Long> list = Func.toLongList(ids);
+		if (!list.isEmpty()) {
+			List<AppPjCorpsAttn> corpsAttnList = corpsAttnService.list(new LambdaQueryWrapper<AppPjCorpsAttn>()
+				.in(AppPjCorpsAttn::getPid, list));
+			if (!corpsAttnList.isEmpty()) {
+				List<Long> attnIds = corpsAttnList.stream().map(AppPjCorpsAttn::getId).collect(Collectors.toList());
+				corpsAttnService.removeByIds(attnIds);
+			}
+			List<AppPjCorpsAddr> corpsAddrList = corpsAddrService.list(new LambdaQueryWrapper<AppPjCorpsAddr>()
+				.in(AppPjCorpsAddr::getPid, list));
+			if (!corpsAddrList.isEmpty()) {
+				List<Long> addrIds = corpsAddrList.stream().map(AppPjCorpsAddr::getId).collect(Collectors.toList());
+				corpsAddrService.removeByIds(addrIds);
+			}
+		}
+		return R.status(corpsDescService.removeByIds(list));
+	}
+
 
 }

blade-service/gubersail-dealer-app/src/main/java/com/gubersail/app/corp/service/impl/AppCorpsDescServiceImpl.java

@@ -135,8 +135,6 @@ public class AppCorpsDescServiceImpl extends ServiceImpl<AppCorpsDescMapper, App
 			corpsDesc.setCreateUser(userId);
 			corpsDesc.setSalesCompanyId(Long.valueOf(AuthUtil.getDeptId()));
 			corpsDesc.setSalesCompanyName(sysClient.getDept(Long.valueOf(AuthUtil.getDeptId())).getData().getFullName());
-			corpsDesc.setEnableOrNot(1);
-			corpsDesc.setCheckStatus("审核通过");
 			corpsDesc.setTel(corpsDescVO.getContactsPhone());
 			corpsDesc.setCorpType("KH");
 			//查询当前登录人信息

blade-service/gubersail-shop-app/src/main/java/com/gubersail/shop/app/claim/controller/ShopAppClaimController.java

@@ -81,4 +81,20 @@ public class ShopAppClaimController extends BladeController {
 		return bladeClaimService.submit(bladeClaim);
 	}
 
+	/**
+	 * 提交审批
+	 */
+	@GetMapping("/submitApproval")
+	public R submitApproval(@RequestParam("id")Long id) {
+		return bladeClaimService.submitApproval(id);
+	}
+
+	/**
+	 * 撤销审批
+	 */
+	@GetMapping("/revokeApproval")
+	public R revokeApproval(@RequestParam("id")Long id) {
+		return bladeClaimService.revokeApproval(id);
+	}
+
 }

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

@@ -36,4 +36,7 @@ public interface IShopAppClaimService extends IService<ShopAppClaim> {
 
 	ShopAppClaimVO detail(ShopAppClaim bladeClaim);
 
+	R submitApproval(Long id);
+
+	R revokeApproval(Long id);
 }

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

@@ -115,4 +115,38 @@ public class ShopAppClaimServiceImpl extends ServiceImpl<ShopAppClaimMapper, Sho
 		return bladeClaimVO;
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public R submitApproval(Long id) {
+		//通过id查询理赔数据
+		ShopAppClaim claim = this.getById(id);
+		//判断审核状态是否是录入状态
+		if (claim.getAuditStatus() > 0) {
+			throw new RuntimeException("已提交审批，请勿重复审批");
+		}
+		claim.setAuditStatus(1);
+		claim.setUpdateTime(new Date());
+		claim.setUpdateUser(AuthUtil.getUserId());
+		claim.setVersion(claim.getVersion() == null ? 1 : claim.getVersion() + 1);
+		this.updateById(claim);
+		return R.success("操作成功");
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public R revokeApproval(Long id) {
+		//通过id查询理赔数据
+		ShopAppClaim claim = this.getById(id);
+		//判断审核状态是否是审核中
+		if (claim.getAuditStatus() != 1) {
+			throw new RuntimeException("理赔单据已审批");
+		}
+		claim.setAuditStatus(0);
+		claim.setUpdateTime(new Date());
+		claim.setUpdateUser(AuthUtil.getUserId());
+		claim.setVersion(claim.getVersion() == null ? 1 : claim.getVersion() + 1);
+		this.updateById(claim);
+		return R.success("操作成功");
+	}
+
 }

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

@@ -150,7 +150,7 @@ public class ShopAppTireInsuranceRegisterController extends BladeController {
 
 
 	/**
-	 * 提交
+	 * 轮胎保确认提交
 	 */
 	@PostMapping("/submitTireInsurance")
 	public R submitTireInsurance(@Valid @RequestBody ShopAppTireInsuranceRegisterVO appTireInsuranceRegister) {
@@ -158,7 +158,15 @@ public class ShopAppTireInsuranceRegisterController extends BladeController {
 	}
 
 	/**
-	 * 撤销提交
+	 * 生成理赔单据
+	 */
+	@PostMapping("/generateShopAppClaim")
+	public R generateShopAppClaim(@Valid @RequestBody ShopAppTireInsuranceRegisterVO appTireInsuranceRegister) {
+		return tireInsuranceRegisterService.generateShopAppClaim(appTireInsuranceRegister);
+	}
+
+	/**
+	 * 删除理赔记录
 	 */
 	@GetMapping("/revokeTireInsurance")
 	public R revokeTireInsurance(@RequestParam("id") Long id) {

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

@@ -46,4 +46,6 @@ public interface IShopAppTireInsuranceRegisterService extends IService<ShopAppTi
 	R submitTireInsurance(ShopAppTireInsuranceRegisterVO appTireInsuranceRegister);
 
 	R revokeTireInsurance(Long id);
+
+	R generateShopAppClaim(ShopAppTireInsuranceRegisterVO appTireInsuranceRegister);
 }

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

@@ -113,6 +113,7 @@ public class ShopAppTireInsuranceRegisterServiceImpl extends ServiceImpl<ShopApp
 			tireInsuranceRegister.setInsuranceNo(billNo);
 			tireInsuranceRegister.setCreateTime(new Date());
 			tireInsuranceRegister.setCreateUser(AuthUtil.getUserId());
+			tireInsuranceRegister.setStatus(0);
 			//查询当前登录人信息
 			R<User> userR = userClient.userInfoById(AuthUtil.getUserId());
 			if (!userR.isSuccess() || ObjectUtils.isNull(userR.getData())) {
@@ -142,9 +143,45 @@ public class ShopAppTireInsuranceRegisterServiceImpl extends ServiceImpl<ShopApp
 		BeanUtil.copyProperties(appTireInsuranceRegister, tireInsuranceRegister);
 
 		// 2. 设置更新信息
-		tireInsuranceRegister.setUpdateUser(AuthUtil.getUserId());  // 设置更新人ID
-		tireInsuranceRegister.setUpdateTime(new Date());           // 设置更新时间
-		tireInsuranceRegister.setStatus(2);                        // 设置状态为1（已提交）
+		// 设置更新人ID
+		tireInsuranceRegister.setUpdateUser(AuthUtil.getUserId());
+		// 设置更新时间
+		tireInsuranceRegister.setUpdateTime(new Date());
+		// 设置状态为1（已提交）
+		tireInsuranceRegister.setStatus(1);
+		// 3. 更新轮胎保险注册信息
+		this.updateById(tireInsuranceRegister);
+		// 4. 返回处理结果
+		return R.data(appTireInsuranceRegister);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public R revokeTireInsurance(Long id) {
+		ShopAppTireInsuranceRecord record = appTireInsuranceRecordService.getById(id);
+		if (record == null){
+			throw new RuntimeException("未查到理赔记录信息");
+		}
+		appTireInsuranceRecordService.removeById(id);
+		ShopAppClaim claim = bladeClaimService.getById(record.getClaimId());
+		if(claim != null){
+			if (2 == claim.getStatus()){
+				throw new RuntimeException("理赔已通过，删除失败");
+			}
+			bladeClaimService.removeById(claim.getId());
+			Map<String, Object> map = new HashMap<>();
+			map.put("claim_id", claim.getId());
+			bladeClaimAttachmentService.removeByMap(map);
+		}
+		return R.data("操作成功");
+	}
+
+	@Override
+	public R generateShopAppClaim(ShopAppTireInsuranceRegisterVO appTireInsuranceRegister) {
+		// 1. 创建轮胎保险注册实体并复制属性
+		ShopAppTireInsuranceRegister tireInsuranceRegister = new ShopAppTireInsuranceRegister();
+		BeanUtil.copyProperties(appTireInsuranceRegister, tireInsuranceRegister);
+
 		Calendar cal1 = Calendar.getInstance();
 		cal1.setTime(new Date());
 		cal1.set(Calendar.HOUR_OF_DAY, 0);
@@ -161,19 +198,14 @@ public class ShopAppTireInsuranceRegisterServiceImpl extends ServiceImpl<ShopApp
 		if (cal1.before(cal2)) {
 			System.out.println("轮胎保已失效，操作失败！");
 		}
-		// 3. 更新轮胎保险注册信息
-		this.updateById(tireInsuranceRegister);
-
 		// 4. 创建理赔申请实体
 		ShopAppClaim claim = new ShopAppClaim();
-
 		// 5. 生成理赔单号
 		String billNo = BillCodeUtil.getBillCodeByType(SecureUtil.getTenantId(), "LP");
 		if (!StringUtils.hasText(billNo) || billNo.length() < NumberEnum.FIFTEEN.number) {
 			return R.fail(HttpStatus.INTERNAL_SERVER_ERROR.value(), "生成系统编号失败");
 		}
 		claim.setClaimNo(billNo);  // 设置理赔单号
-
 		// 6. 设置理赔基本信息
 		claim.setCreateTime(new Date());                                    // 创建时间
 		claim.setCreateUser(AuthUtil.getUserId());                          // 创建人ID
@@ -183,7 +215,7 @@ public class ShopAppTireInsuranceRegisterServiceImpl extends ServiceImpl<ShopApp
 		claim.setTireQuantity(tireInsuranceRegister.getTireQuantity());     // 轮胎数量
 		claim.setTyreNo(tireInsuranceRegister.getInsuranceNo());            // 胎号/轮胎宝编号
 		claim.setTyreSpecs(tireInsuranceRegister.getTyreSpecs());           // 规格型号
-		claim.setAuditStatus(1);                                            // 审核状态
+		claim.setAuditStatus(0);                                            // 审核状态
 		claim.setSubmitTime(new Date());                                    // 提交时间
 		claim.setClaimReason("");
 		// 7. 设置理赔来源信息（区分管理员和普通用户）
@@ -221,41 +253,6 @@ public class ShopAppTireInsuranceRegisterServiceImpl extends ServiceImpl<ShopApp
 
 		// 8. 保存理赔申请信息
 		bladeClaimService.save(claim);
-
-		// 9. 处理理赔附件信息
-		List<ShopAppClaimAttachment> claimAttachmentList = new ArrayList<>();
-
-		// 9.1 整车照片附件
-		if (ObjectUtils.isNotNull(tireInsuranceRegister.getOverallVehicleUrl())) {
-			ShopAppClaimAttachment shopAppClaimAttachment =
-				saveClaimAttachment(tireInsuranceRegister.getOverallVehicleUrl(), claim.getId(), 1);
-			claimAttachmentList.add(shopAppClaimAttachment);
-		}
-
-		// 9.2 轮胎点照片附件
-		if (ObjectUtils.isNotNull(tireInsuranceRegister.getTireDotUrl())) {
-			ShopAppClaimAttachment shopAppClaimAttachment =
-				saveClaimAttachment(tireInsuranceRegister.getTireDotUrl(), claim.getId(), 2);
-			claimAttachmentList.add(shopAppClaimAttachment);
-		}
-
-		// 9.3 轮胎花纹照片附件
-		if (ObjectUtils.isNotNull(tireInsuranceRegister.getTirePatternUrl())) {
-			ShopAppClaimAttachment shopAppClaimAttachment =
-				saveClaimAttachment(tireInsuranceRegister.getTirePatternUrl(), claim.getId(), 3);
-			claimAttachmentList.add(shopAppClaimAttachment);
-		}
-
-		// 9.4 行驶证照片附件
-		if (ObjectUtils.isNotNull(tireInsuranceRegister.getVehicleLicenseUrl())) {
-			ShopAppClaimAttachment shopAppClaimAttachment =
-				saveClaimAttachment(tireInsuranceRegister.getVehicleLicenseUrl(), claim.getId(), 5);
-			claimAttachmentList.add(shopAppClaimAttachment);
-		}
-
-		// 10. 批量保存理赔附件
-		bladeClaimAttachmentService.saveBatch(claimAttachmentList);
-
 		ShopAppTireInsuranceRecord tireInsuranceRecord = new ShopAppTireInsuranceRecord();
 		tireInsuranceRecord.setInsuranceNo(tireInsuranceRegister.getInsuranceNo());
 		tireInsuranceRecord.setInsuranceId(tireInsuranceRegister.getId());
@@ -267,40 +264,11 @@ public class ShopAppTireInsuranceRegisterServiceImpl extends ServiceImpl<ShopApp
 		tireInsuranceRecord.setClaimReason(claim.getClaimReason());
 		tireInsuranceRecord.setClaimDate(new Date());
 		appTireInsuranceRecordService.save(tireInsuranceRecord);
+		appTireInsuranceRegister.setClaimId(tireInsuranceRecord.getClaimId());
 		// 11. 返回处理结果
 		return R.data(appTireInsuranceRegister);
 	}
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public R revokeTireInsurance(Long id) {
-		ShopAppTireInsuranceRegister tireInsuranceRegister = baseMapper.selectById(id);
-
-		// 2. 设置更新信息
-		tireInsuranceRegister.setUpdateUser(AuthUtil.getUserId());  // 设置更新人ID
-		tireInsuranceRegister.setUpdateTime(new Date());           // 设置更新时间
-		if (2 != tireInsuranceRegister.getStatus()) {
-			throw new RuntimeException("工厂已受理/审核通过,撤销失败!");
-		}
-		tireInsuranceRegister.setStatus(1);                        // 设置状态为1（已提交）
-
-		// 3. 更新轮胎保险注册信息
-		this.updateById(tireInsuranceRegister);
-
-		ShopAppClaim claim = bladeClaimService.getOne(new LambdaQueryWrapper<ShopAppClaim>()
-			.eq(ShopAppClaim::getTyreNo, tireInsuranceRegister.getInsuranceNo())
-			.eq(ShopAppClaim::getIsDeleted, 0)
-			.eq(ShopAppClaim::getAuditStatus, 1)
-			.last("LIMIT 1"));
-		if(claim != null){
-			bladeClaimService.removeById(claim.getId());
-			Map<String, Object> map = new HashMap<>();
-			map.put("claim_id", claim.getId());
-			bladeClaimAttachmentService.removeByMap(map);
-		}
-		return R.data(tireInsuranceRegister);
-	}
-
 	private ShopAppClaimAttachment saveClaimAttachment(String url, Long claimId, int type) {
 		ShopAppClaimAttachment shopAppClaimAttachment = new ShopAppClaimAttachment();
 		shopAppClaimAttachment.setClaimId(claimId);