提交发票修改流程

yudao-module-car/yudao-module-car-biz/pom.xml

@@ -68,5 +68,30 @@
             <version>2.2.0-jdk8-snapshot</version>
             <scope>compile</scope>
         </dependency>
+        
+        <!-- Thymeleaf 模板引擎 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        
+        <!-- OpenHTMLToPDF - HTML转PDF -->
+        <dependency>
+            <groupId>com.openhtmltopdf</groupId>
+            <artifactId>openhtmltopdf-pdfbox</artifactId>
+            <version>1.0.10</version>
+        </dependency>
+        <dependency>
+            <groupId>com.openhtmltopdf</groupId>
+            <artifactId>openhtmltopdf-svg-support</artifactId>
+            <version>1.0.10</version>
+        </dependency>
+        
+        <!-- 文件上传 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-infra-biz</artifactId>
+            <version>${revision}</version>
+        </dependency>
     </dependencies>
 </project>

yudao-module-car/yudao-module-car-biz/src/main/java/cn/iocoder/yudao/module/car/controller/admin/login/vo/TireLoginRespVO.java

@@ -30,7 +30,7 @@ public class TireLoginRespVO{
 
      @Schema(description = "门店ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11176")
      @ExcelProperty("门店ID")
-     private Long storeId;
+     private String storeId;
 
      @Schema(description = "仓库编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11178")
      @ExcelProperty("仓库编号")

yudao-module-car/yudao-module-car-biz/src/main/java/cn/iocoder/yudao/module/car/controller/admin/renewalorder/RenewalOrderController.java

@@ -1,9 +1,15 @@
 package cn.iocoder.yudao.module.car.controller.admin.renewalorder;
 
+import cn.iocoder.yudao.framework.security.core.LoginUser;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.system.service.permission.PermissionService;
+import com.google.common.collect.Lists;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
@@ -18,6 +24,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import static cn.iocoder.yudao.framework.common.enums.UserTypeEnum.ADMIN;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
@@ -53,6 +61,22 @@ public class RenewalOrderController {
         return success(true);
     }
 
+    @PostMapping("/generate-contract")
+    @Operation(summary = "生成在线合同 PDF 并上传（回写 contractUrl）")
+    @Parameter(name = "id", description = "订单编号", required = true)
+    @PreAuthorize("@ss.hasPermission('car:renewal-order:update')")
+    public CommonResult<String> generateContract(@RequestParam("id") Long id) {
+        return success(renewalOrderService.generateContract(id));
+    }
+
+    @GetMapping("/generate-contract-html")
+    @Operation(summary = "生成合同 HTML（用于预览）")
+    @Parameter(name = "id", description = "订单编号", required = true)
+    @PreAuthorize("@ss.hasPermission('car:renewal-order:query')")
+    public CommonResult<String> generateContractHtml(@RequestParam("id") Long id) {
+        return success(renewalOrderService.generateContractHtml(id));
+    }
+
     @DeleteMapping("/delete")
     @Operation(summary = "删除车辆续保订单")
     @Parameter(name = "id", description = "编号", required = true)
@@ -70,15 +94,28 @@ public class RenewalOrderController {
         RenewalOrderDO renewalOrder = renewalOrderService.getRenewalOrder(id);
         return success(BeanUtils.toBean(renewalOrder, RenewalOrderRespVO.class));
     }
+    @Resource
+    private PermissionService permissionService;
 
     @GetMapping("/page")
     @Operation(summary = "获得车辆续保订单分页")
     @PreAuthorize("@ss.hasPermission('car:renewal-order:query')")
-    public CommonResult<PageResult<RenewalOrderRespVO>> getRenewalOrderPage(@Valid RenewalOrderPageReqVO pageReqVO) {
+    public CommonResult<PageResult<RenewalOrderRespVO>> getRenewalOrderPage(
+            @Valid RenewalOrderPageReqVO pageReqVO) {
+
+        Long userId = SecurityFrameworkUtils.getLoginUserId();
+
+        boolean isTenantAdmin = permissionService.hasAnyRoles(userId, "tenant_admin");
+
+        if (!isTenantAdmin) {
+            pageReqVO.setCreator(String.valueOf(userId));
+        }
+
         PageResult<RenewalOrderDO> pageResult = renewalOrderService.getRenewalOrderPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, RenewalOrderRespVO.class));
     }
 
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出车辆续保订单 Excel")
     @PreAuthorize("@ss.hasPermission('car:renewal-order:export')")

yudao-module-car/yudao-module-car-biz/src/main/java/cn/iocoder/yudao/module/car/controller/admin/renewalorder/vo/RenewalOrderPageReqVO.java

@@ -96,15 +96,48 @@ public class RenewalOrderPageReqVO extends PageParam {
 
     @Schema(description = "合同备注", example = "你说的对")
     private String contractRemark;
+    private String contractUrl;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    private String creator;
+
     private Long storeId;
 
     private String storeName;
 
     private String invoiceUrl;
+    private String productType;
+    @Schema(description = "客户签名")
+    private String customerSignatureUrl;
+
+    @Schema(description = "身份证正面")
+    private String idCardFrontUrl;
+
+    @Schema(description = "身份证反面")
+    private String idCardBackUrl;
+
+    @Schema(description = "行驶证")
+    private String drivingLicenseUrl;
+
+    @Schema(description = "购车发票（多张，JSON字符串）")
+    private List<String> carInvoiceUrls;
+
+    @Schema(description = "购置税发票（多张，JSON字符串）")
+    private List<String> purchaseTaxInvoiceUrls;
+
+    @Schema(description = "商业险保单（多张，JSON字符串）")
+    private List<String> businessInsurancePolicyUrls;
+
+    @Schema(description = "合格证")
+    private String certificateOfConformityUrl;
+
+    @Schema(description = "里程表照片")
+    private String odometerPhotoUrl;
+
+    @Schema(description = "车名牌照片")
+    private String nameplatePhotoUrl;
 
 }

yudao-module-car/yudao-module-car-biz/src/main/java/cn/iocoder/yudao/module/car/controller/admin/renewalorder/vo/RenewalOrderRespVO.java

@@ -122,6 +122,7 @@ public class RenewalOrderRespVO {
     @Schema(description = "合同备注", example = "你说的对")
     @ExcelProperty("合同备注")
     private String contractRemark;
+    private String contractUrl;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
@@ -132,5 +133,45 @@ public class RenewalOrderRespVO {
     private String storeName;
 
     private String invoiceUrl;
+    private String productType;
+    @Schema(description = "客户签名")
+    @ExcelProperty("客户签名")
+    private String customerSignatureUrl;
+
+    @Schema(description = "身份证正面")
+    @ExcelProperty("身份证正面")
+    private String idCardFrontUrl;
+
+    @Schema(description = "身份证反面")
+    @ExcelProperty("身份证反面")
+    private String idCardBackUrl;
+
+    @Schema(description = "行驶证")
+    @ExcelProperty("行驶证")
+    private String drivingLicenseUrl;
+
+    @Schema(description = "购车发票（多张）")
+    @ExcelProperty("购车发票")
+    private List<String> carInvoiceUrls;
+
+    @Schema(description = "购置税发票（多张）")
+    @ExcelProperty("购置税发票")
+    private List<String> purchaseTaxInvoiceUrls;
+
+    @Schema(description = "商业险保单（多张）")
+    @ExcelProperty("商业险保单")
+    private List<String> businessInsurancePolicyUrls;
+
+    @Schema(description = "合格证")
+    @ExcelProperty("合格证")
+    private String certificateOfConformityUrl;
+
+    @Schema(description = "里程表照片")
+    @ExcelProperty("里程表照片")
+    private String odometerPhotoUrl;
+
+    @Schema(description = "车名牌照片")
+    @ExcelProperty("车名牌照片")
+    private String nameplatePhotoUrl;
 
 }

yudao-module-car/yudao-module-car-biz/src/main/java/cn/iocoder/yudao/module/car/controller/admin/renewalorder/vo/RenewalOrderSaveReqVO.java

@@ -94,6 +94,7 @@ public class RenewalOrderSaveReqVO {
 
     @Schema(description = "合同备注", example = "你说的对")
     private String contractRemark;
+    private String contractUrl;
 
     private Long storeId;
 
@@ -101,4 +102,35 @@ public class RenewalOrderSaveReqVO {
 
     private String invoiceUrl;
 
+    private String productType;
+    @Schema(description = "客户签名")
+    private String customerSignatureUrl;
+
+    @Schema(description = "身份证正面")
+    private String idCardFrontUrl;
+
+    @Schema(description = "身份证反面")
+    private String idCardBackUrl;
+
+    @Schema(description = "行驶证")
+    private String drivingLicenseUrl;
+
+    @Schema(description = "购车发票（多张）")
+    private List<String> carInvoiceUrls;
+
+    @Schema(description = "购置税发票（多张）")
+    private List<String> purchaseTaxInvoiceUrls;
+
+    @Schema(description = "商业险保单（多张）")
+    private List<String> businessInsurancePolicyUrls;
+
+    @Schema(description = "合格证")
+    private String certificateOfConformityUrl;
+
+    @Schema(description = "里程表照片")
+    private String odometerPhotoUrl;
+
+    @Schema(description = "车名牌照片")
+    private String nameplatePhotoUrl;
+
 }

yudao-module-car/yudao-module-car-biz/src/main/java/cn/iocoder/yudao/module/car/controller/admin/renewalproduct/RenewalProductController.java

@@ -79,6 +79,17 @@ public class RenewalProductController {
         return success(BeanUtils.toBean(pageResult, RenewalProductRespVO.class));
     }
 
+    @GetMapping("/findByProductType")
+    @Operation(summary = "获得车辆续保产品信息")
+    @PreAuthorize("@ss.hasPermission('car:renewal-product:query')")
+    public CommonResult<List<RenewalProductRespVO>> findByProductType() {
+        // 调用服务层的方法，查询所有符合条件的记录
+        List<RenewalProductDO> list = renewalProductService.findByProductType();
+
+        // 返回成功结果，转换为 VO 类型
+        return success(BeanUtils.toBean(list, RenewalProductRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出车辆续保产品信息 Excel")
     @PreAuthorize("@ss.hasPermission('car:renewal-product:export')")