src/main/java/com/imyeyu/api/modules/gao/controller/GaoOrderFulfillmentController.java

@@ -2,6 +2,7 @@ package com.imyeyu.api.modules.gao.controller;
 
 import com.imyeyu.api.modules.common.entity.Attachment;
 import com.imyeyu.api.modules.common.service.AttachmentService;
+import com.imyeyu.api.bean.PermissionMatchMode;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
 import com.imyeyu.api.modules.gao.entity.GaoCustomer;
@@ -78,6 +79,16 @@ public class GaoOrderFulfillmentController {
 		return result;
 	}
 
+	@AOPLog
+	@RequestRateLimit
+	@RequireGaoPermission(value = { GaoPermissionCode.ORDER_FULFILLMENT_CREATE, GaoPermissionCode.ORDER_FULFILLMENT_VERIFY }, mode = PermissionMatchMode.ALL)
+	@PostMapping("/create-and-verify")
+	public GaoOrderFulfillment createAndVerify(@RequestBody GaoOrderFulfillmentCreateRequest request) {
+		GaoOrderFulfillment result = service.createAndVerify(request);
+		fillTransient(List.of(result));
+		return result;
+	}
+
 	@AOPLog
 	@RequestRateLimit
 	@RequireGaoPermission(GaoPermissionCode.ORDER_FULFILLMENT_VERIFY)

src/main/java/com/imyeyu/api/modules/gao/controller/GaoSalesOrderController.java

@@ -102,6 +102,14 @@ public class GaoSalesOrderController {
 		return paymentService.receive(request);
 	}
 
+	@AOPLog
+	@RequestRateLimit
+	@RequireGaoPermission(value = { GaoPermissionCode.FUND_RECEIVE_CREATE, GaoPermissionCode.FUND_RECEIVE_VERIFY }, mode = PermissionMatchMode.ALL)
+	@PostMapping("/payment/receive-and-verify")
+	public GaoFundRecord receiveAndVerify(@RequestBody GaoOrderPaymentReceiveRequest request) {
+		return paymentService.receiveAndVerify(request);
+	}
+
 	@AOPLog
 	@RequestRateLimit
 	@RequireGaoPermission(GaoPermissionCode.FUND_RECEIVE_VERIFY)

src/main/java/com/imyeyu/api/modules/gao/service/GaoOrderFulfillmentService.java

@@ -32,6 +32,9 @@ public interface GaoOrderFulfillmentService extends BaseService<GaoOrderFulfillm
 	/// 创建履约单
 	GaoOrderFulfillment create(GaoOrderFulfillmentCreateRequest request);
 
+	/// 创建并直接核销履约单
+	GaoOrderFulfillment createAndVerify(GaoOrderFulfillmentCreateRequest request);
+
 	/// 为库存不足履约单准备库存
 	GaoOrderFulfillment prepareStock(GaoOrderFulfillmentPrepareStockRequest request);
 

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoOrderFulfillmentServiceImplement.java

@@ -153,6 +153,19 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
 		return createInternal(request);
 	}
 
+	@OperationAudit(AuditOperation.GAO_ORDER_FULFILLMENT_CREATE)
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public GaoOrderFulfillment createAndVerify(GaoOrderFulfillmentCreateRequest request) {
+		GaoOrderFulfillment fulfillment = createInternal(request);
+		if (fulfillment.getStatus() == GaoOrderFulfillment.Status.VERIFIED) {
+			return fulfillment;
+		}
+		TimiException.requiredTrue(fulfillment.getStatus() == GaoOrderFulfillment.Status.PENDING,
+			"库存不足，不能直接核销履约");
+		return verifyInternal(actionRequest(fulfillment.getId()));
+	}
+
 	private GaoOrderFulfillment createInternal(GaoOrderFulfillmentCreateRequest request) {
 		TimiException.required(request, "not found fulfillment request");
 		String requestNo = requiredText(request.getRequestNo(), "not found requestNo");
@@ -588,6 +601,12 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
 		}
 	}
 
+	private GaoOrderFulfillmentActionRequest actionRequest(String fulfillmentId) {
+		GaoOrderFulfillmentActionRequest request = new GaoOrderFulfillmentActionRequest();
+		request.setFulfillmentId(fulfillmentId);
+		return request;
+	}
+
 	private GaoOrderFulfillmentItem copyFulfillmentItem(GaoOrderFulfillmentItem source) {
 		GaoOrderFulfillmentItem result = new GaoOrderFulfillmentItem();
 		result.setSkuId(source.getSkuId());