增加与ai大模型对话

huimv-employment/fe-api/src/main/java/com/huimv/employment/controller/mp/EmploymentOrderController.java

@@ -6,6 +6,8 @@ import com.huimv.employment.common.web.R;
 import com.huimv.employment.security.LoginUser;
 import com.huimv.employment.security.LoginUserHolder;
 import com.huimv.employment.service.order.EmploymentOrderService;
+import com.huimv.employment.service.order.dto.OrderCompleteRequest;
+import com.huimv.employment.service.order.dto.OrderCompleteResponse;
 import com.huimv.employment.service.order.dto.OrderStartWorkRequest;
 import com.huimv.employment.service.order.dto.OrderStartWorkResponse;
 import com.huimv.employment.service.settlement.SettlementService;
@@ -28,12 +30,13 @@ import org.springframework.web.bind.annotation.RestController;
  * 企业端用工订单 API。
  * <p>
  * 节点推进：确认开工（→ work_started）、发起结算（→ settlement_pending）、
- * 确认并支付（→ settlement_paid）。均需企业 JWT；订单须归属当前登录企业。
+ * 确认并支付（→ settlement_paid）、完税开票办结（→ completed）。
+ * 均需企业 JWT；订单须归属当前登录企业。
  * </p>
  */
 @RestController
 @RequestMapping("/api/v1/mp/orders")
-@Tag(name = "用工订单", description = "企业确认开工、发起结算、确认支付等")
+@Tag(name = "用工订单", description = "企业确认开工、结算支付、完税开票办结等")
 @SecurityRequirement(name = "Authorization")
 public class EmploymentOrderController {
 
@@ -126,6 +129,24 @@ public class EmploymentOrderController {
         return R.ok(settlementService.confirmAndPay(LoginUserHolder.require().getUserId(), orderId, request));
     }
 
+    @PostMapping("/{orderId}/complete")
+    @Operation(summary = "完税开票办结",
+            description = "支付完成后企业确认完税与开票，订单 settlement_paid→completed。"
+                    + "默认 tax_cleared/invoice_issued 为 true；显式 false 拒绝办结。"
+                    + "可传 invoice_no、tax_voucher_no 留痕。已办结幂等返回。",
+            parameters = {
+                    @Parameter(name = "orderId", in = ParameterIn.PATH, required = true,
+                            description = "fe_employment_order.id")
+            })
+    public R<OrderCompleteResponse> complete(@PathVariable("orderId") Long orderId,
+                                             @RequestBody(required = false) OrderCompleteRequest request) {
+        requireEnterprise();
+        if (request == null) {
+            request = new OrderCompleteRequest();
+        }
+        return R.ok(settlementService.completeOrder(LoginUserHolder.require().getUserId(), orderId, request));
+    }
+
     /** 本 Controller 接口仅企业用户可访问。 */
     private static LoginUser requireEnterprise() {
         LoginUser loginUser = LoginUserHolder.require();

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/order/dto/OrderCompleteRequest.java

@@ -0,0 +1,86 @@
+package com.huimv.employment.service.order.dto;
+
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+/**
+ * 企业完税/开票办结请求体。
+ * <p>订单 {@code settlement_paid → completed}。MVP 默认完税、开票均视为已完成。</p>
+ */
+@Schema(description = "企业完税开票办结请求")
+public class OrderCompleteRequest {
+
+    @JsonProperty("tax_cleared")
+    @JsonAlias({"taxCleared"})
+    @Schema(description = "是否已完税；默认 true（MVP Mock）")
+    private Boolean taxCleared;
+
+    @JsonProperty("invoice_issued")
+    @JsonAlias({"invoiceIssued"})
+    @Schema(description = "是否已开票；默认 true（MVP Mock）")
+    private Boolean invoiceIssued;
+
+    @JsonProperty("invoice_no")
+    @JsonAlias({"invoiceNo"})
+    @Schema(description = "发票号码（可选留痕）", example = "INV20260728001")
+    private String invoiceNo;
+
+    @JsonProperty("tax_voucher_no")
+    @JsonAlias({"taxVoucherNo"})
+    @Schema(description = "完税凭证号（可选留痕）", example = "TAX20260728001")
+    private String taxVoucherNo;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    public Boolean getTaxCleared() {
+        return taxCleared;
+    }
+
+    public void setTaxCleared(Boolean taxCleared) {
+        this.taxCleared = taxCleared;
+    }
+
+    /** 未传时默认 true */
+    public boolean isTaxClearedOrDefault() {
+        return taxCleared == null || Boolean.TRUE.equals(taxCleared);
+    }
+
+    public Boolean getInvoiceIssued() {
+        return invoiceIssued;
+    }
+
+    public void setInvoiceIssued(Boolean invoiceIssued) {
+        this.invoiceIssued = invoiceIssued;
+    }
+
+    /** 未传时默认 true */
+    public boolean isInvoiceIssuedOrDefault() {
+        return invoiceIssued == null || Boolean.TRUE.equals(invoiceIssued);
+    }
+
+    public String getInvoiceNo() {
+        return invoiceNo;
+    }
+
+    public void setInvoiceNo(String invoiceNo) {
+        this.invoiceNo = invoiceNo;
+    }
+
+    public String getTaxVoucherNo() {
+        return taxVoucherNo;
+    }
+
+    public void setTaxVoucherNo(String taxVoucherNo) {
+        this.taxVoucherNo = taxVoucherNo;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/order/dto/OrderCompleteResponse.java

@@ -0,0 +1,156 @@
+package com.huimv.employment.service.order.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 订单办结（完税/开票）响应。
+ */
+@Schema(description = "订单办结响应")
+public class OrderCompleteResponse {
+
+    @JsonProperty("order_id")
+    private Long orderId;
+
+    @JsonProperty("order_no")
+    private String orderNo;
+
+    @JsonProperty("current_step_code")
+    private String currentStepCode;
+
+    @JsonProperty("order_status")
+    private String orderStatus;
+
+    @JsonProperty("settlement_id")
+    private Long settlementId;
+
+    @JsonProperty("settlement_no")
+    private String settlementNo;
+
+    @JsonProperty("invoice_amount")
+    private BigDecimal invoiceAmount;
+
+    @JsonProperty("tax_cleared")
+    private Boolean taxCleared;
+
+    @JsonProperty("invoice_issued")
+    private Boolean invoiceIssued;
+
+    @JsonProperty("invoice_no")
+    private String invoiceNo;
+
+    @JsonProperty("tax_voucher_no")
+    private String taxVoucherNo;
+
+    private String message;
+
+    @JsonProperty("completed_at")
+    private LocalDateTime completedAt;
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getCurrentStepCode() {
+        return currentStepCode;
+    }
+
+    public void setCurrentStepCode(String currentStepCode) {
+        this.currentStepCode = currentStepCode;
+    }
+
+    public String getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public Long getSettlementId() {
+        return settlementId;
+    }
+
+    public void setSettlementId(Long settlementId) {
+        this.settlementId = settlementId;
+    }
+
+    public String getSettlementNo() {
+        return settlementNo;
+    }
+
+    public void setSettlementNo(String settlementNo) {
+        this.settlementNo = settlementNo;
+    }
+
+    public BigDecimal getInvoiceAmount() {
+        return invoiceAmount;
+    }
+
+    public void setInvoiceAmount(BigDecimal invoiceAmount) {
+        this.invoiceAmount = invoiceAmount;
+    }
+
+    public Boolean getTaxCleared() {
+        return taxCleared;
+    }
+
+    public void setTaxCleared(Boolean taxCleared) {
+        this.taxCleared = taxCleared;
+    }
+
+    public Boolean getInvoiceIssued() {
+        return invoiceIssued;
+    }
+
+    public void setInvoiceIssued(Boolean invoiceIssued) {
+        this.invoiceIssued = invoiceIssued;
+    }
+
+    public String getInvoiceNo() {
+        return invoiceNo;
+    }
+
+    public void setInvoiceNo(String invoiceNo) {
+        this.invoiceNo = invoiceNo;
+    }
+
+    public String getTaxVoucherNo() {
+        return taxVoucherNo;
+    }
+
+    public void setTaxVoucherNo(String taxVoucherNo) {
+        this.taxVoucherNo = taxVoucherNo;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public LocalDateTime getCompletedAt() {
+        return completedAt;
+    }
+
+    public void setCompletedAt(LocalDateTime completedAt) {
+        this.completedAt = completedAt;
+    }
+}

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/settlement/SettlementService.java

@@ -23,6 +23,8 @@ import com.huimv.employment.dao.mapper.FeSettlementItemMapper;
 import com.huimv.employment.dao.mapper.FeSettlementOrderMapper;
 import com.huimv.employment.dao.mapper.FeWorkerRegistrationMapper;
 import com.huimv.employment.service.enterprise.EnterpriseService;
+import com.huimv.employment.service.order.dto.OrderCompleteRequest;
+import com.huimv.employment.service.order.dto.OrderCompleteResponse;
 import com.huimv.employment.service.settlement.dto.OrderStartSettlementRequest;
 import com.huimv.employment.service.settlement.dto.SettlementConfirmPayRequest;
 import com.huimv.employment.service.settlement.dto.SettlementFeeResponse;
@@ -48,9 +50,9 @@ import java.util.concurrent.ThreadLocalRandom;
  * 结算服务（方案 A：企业主动发起）。
  * <p>
  * 流程：{@code work_started} → 发起结算 → {@code settlement_pending} →
- * 确认并支付（Mock）→ {@code settlement_paid}。
+ * 确认并支付（Mock）→ {@code settlement_paid} → 完税/开票办结 → {@code completed}。
  * </p>
- * <p>MVP 无考勤、无真实支付通道：金额按日薪/方案快照估算，支付即时成功。</p>
+ * <p>MVP 无考勤、无真实支付/税票通道：金额按日薪/方案快照估算，支付与办结均为 Mock。</p>
  */
 @Service
 public class SettlementService {
@@ -63,6 +65,8 @@ public class SettlementService {
     private static final String STEP_SETTLEMENT_PENDING = "settlement_pending";
     /** 订单步骤：已支付 */
     private static final String STEP_SETTLEMENT_PAID = "settlement_paid";
+    /** 订单步骤：已完成（完税/开票办结后） */
+    private static final String STEP_COMPLETED = "completed";
     /** 登记状态：已签完合同，可纳入结算 */
     private static final String REG_COMPLETED = "completed";
     /** 结算单状态：待企业确认 */
@@ -83,6 +87,8 @@ public class SettlementService {
     private static final String ORDER_STATUS_SETTLING = "settling";
     /** 订单业务状态：已支付 */
     private static final String ORDER_STATUS_PAID = "paid";
+    /** 订单业务状态：已完成 */
+    private static final String ORDER_STATUS_COMPLETED = "completed";
     private static final String CHANNEL_WECHAT = "wechat";
     private static final String CHANNEL_ALIPAY = "alipay";
     private static final String CHANNEL_BANK = "bank";
@@ -357,6 +363,104 @@ public class SettlementService {
         return toSummary(order, settlement, false, "结算已确认并支付成功");
     }
 
+    /**
+     * 企业完税/开票办结：订单 {@code settlement_paid → completed}。
+     * <ul>
+     *   <li>前置：订单已支付，且存在已支付结算单</li>
+     *   <li>须完税且已开票（MVP 默认均为 true；显式传 false 会拒绝办结）</li>
+     *   <li>结算单合规标签追加完税/开票留痕；发票号、完税凭证号可选写入备注</li>
+     *   <li>幂等：已 completed 直接返回</li>
+     * </ul>
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public OrderCompleteResponse completeOrder(Long userId, Long orderId, OrderCompleteRequest request) {
+        FeEmploymentOrder order = requireOwnedOrder(userId, orderId);
+        LocalDateTime now = LocalDateTime.now();
+
+        if (STEP_COMPLETED.equals(order.getCurrentStepCode())) {
+            return toCompleteResponse(order, findActiveByOrderId(orderId), request, now, "订单已办结");
+        }
+
+        String step = order.getCurrentStepCode();
+        if (!STEP_SETTLEMENT_PAID.equals(step)) {
+            throw new BizException(ErrorCode.BAD_REQUEST,
+                    "仅已支付后可办结（完税/开票），当前步骤：" + (step == null ? "未知" : step));
+        }
+
+        FeSettlementOrder settlement = findActiveByOrderId(orderId);
+        if (settlement == null || !STATUS_PAID.equals(settlement.getSettlementStatus())) {
+            throw new BizException(ErrorCode.BAD_REQUEST, "结算单尚未支付完成，无法办结");
+        }
+
+        OrderCompleteRequest req = request != null ? request : new OrderCompleteRequest();
+        if (!req.isTaxClearedOrDefault()) {
+            throw new BizException(ErrorCode.BAD_REQUEST, "须确认已完税（tax_cleared=true）后才能办结");
+        }
+        if (!req.isInvoiceIssuedOrDefault()) {
+            throw new BizException(ErrorCode.BAD_REQUEST, "须确认已开票（invoice_issued=true）后才能办结");
+        }
+
+        // 结算单合规留痕（MVP 无独立税票表）
+        StringBuilder remark = new StringBuilder("MVP 办结：完税已确认、发票已开具");
+        if (StringUtils.hasText(req.getInvoiceNo())) {
+            remark.append("；发票号=").append(req.getInvoiceNo().trim());
+        }
+        if (StringUtils.hasText(req.getTaxVoucherNo())) {
+            remark.append("；完税凭证=").append(req.getTaxVoucherNo().trim());
+        }
+        if (StringUtils.hasText(req.getRemark())) {
+            remark.append("；").append(req.getRemark().trim());
+        }
+
+        FeSettlementOrder settlementUpdate = new FeSettlementOrder();
+        settlementUpdate.setId(settlement.getId());
+        settlementUpdate.setComplianceTags(
+                "[\"合同已签署\",\"结算已确认\",\"支付已完成\",\"完税已申报\",\"发票已开具\"]");
+        settlementUpdate.setComplianceRemark(remark.toString());
+        settlementUpdate.setUpdateTime(now);
+        feSettlementOrderMapper.updateById(settlementUpdate);
+        settlement.setComplianceTags(settlementUpdate.getComplianceTags());
+        settlement.setComplianceRemark(settlementUpdate.getComplianceRemark());
+
+        FeEmploymentOrder orderUpdate = new FeEmploymentOrder();
+        orderUpdate.setId(order.getId());
+        orderUpdate.setCurrentStepCode(STEP_COMPLETED);
+        orderUpdate.setOrderStatus(ORDER_STATUS_COMPLETED);
+        orderUpdate.setUpdateTime(now);
+        feEmploymentOrderMapper.updateById(orderUpdate);
+        order.setCurrentStepCode(STEP_COMPLETED);
+        order.setOrderStatus(ORDER_STATUS_COMPLETED);
+
+        log.info("订单办结完成 orderId={} settlementId={} invoiceNo={} taxVoucherNo={}",
+                orderId, settlement.getId(), req.getInvoiceNo(), req.getTaxVoucherNo());
+        return toCompleteResponse(order, settlement, req, now, "完税开票已确认，订单已办结");
+    }
+
+    private OrderCompleteResponse toCompleteResponse(FeEmploymentOrder order,
+                                                     FeSettlementOrder settlement,
+                                                     OrderCompleteRequest request,
+                                                     LocalDateTime completedAt,
+                                                     String message) {
+        OrderCompleteRequest req = request != null ? request : new OrderCompleteRequest();
+        OrderCompleteResponse response = new OrderCompleteResponse();
+        response.setOrderId(order.getId());
+        response.setOrderNo(order.getOrderNo());
+        response.setCurrentStepCode(order.getCurrentStepCode());
+        response.setOrderStatus(order.getOrderStatus());
+        if (settlement != null) {
+            response.setSettlementId(settlement.getId());
+            response.setSettlementNo(settlement.getSettlementNo());
+            response.setInvoiceAmount(settlement.getInvoiceAmount());
+        }
+        response.setTaxCleared(req.isTaxClearedOrDefault());
+        response.setInvoiceIssued(req.isInvoiceIssuedOrDefault());
+        response.setInvoiceNo(StringUtils.hasText(req.getInvoiceNo()) ? req.getInvoiceNo().trim() : null);
+        response.setTaxVoucherNo(StringUtils.hasText(req.getTaxVoucherNo()) ? req.getTaxVoucherNo().trim() : null);
+        response.setMessage(message);
+        response.setCompletedAt(completedAt);
+        return response;
+    }
+
     /**
      * 幂等路径：结算单已存在但订单步骤未跟上时，校正到 settlement_pending。
      */