费用提交

lastleg-service/src/main/java/com/baiyue/lastleg/procurement/service/OverseasProcurementService.java

@@ -234,8 +234,11 @@ public class OverseasProcurementService {
         if (!PENDING_REVIEW.equals(order.getStatus())) throw conflict("Overseas procurement order was already reviewed");
         String direction = request.procurementDirection() == null ? ProcurementDirection.normalize(order.getProcurementDirection())
             : ProcurementDirection.normalize(request.procurementDirection());
-        if (!direction.equals(ProcurementDirection.normalize(order.getProcurementDirection())) && directionRepository.hasStarted(order.getId())) {
-            throw conflict("本单已有购买或收货事实，不能切换采购方向");
+        if (!direction.equals(ProcurementDirection.normalize(order.getProcurementDirection()))) {
+            throw conflict("审核不能修改采购方向，请按客户下单方向选择采购仓");
+        }
+        if (REJECTED.equals(next) && trim(request.remark()) == null) {
+            throw badRequest("请填写拒绝原因");
         }
         Map<String, Object> before = reviewSnapshot(order);
         if (WAIT_PURCHASE.equals(next)) {

lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml

@@ -5055,7 +5055,7 @@ components:
     ProcurementReview:
       type: object
       required: [version, decision, idempotencyKey]
-      description: 审核通过必须选择与采购方向匹配的有效公共收货仓；国内采购选择国内仓，海外采购选择海外收货仓；拒绝不要求仓库。已有购买或收货事实不得切换方向。
+      description: 审核通过必须选择与采购方向匹配的有效公共收货仓；国内采购选择国内仓，海外采购选择海外收货仓；拒绝不要求仓库，但 remark 必须填写非空白拒绝原因。审核不得修改客户下单采购方向。
       properties:
         procurementDirection: { $ref: '#/components/schemas/ProcurementDirection' }
         version: { type: integer, format: int64, minimum: 0 }