Merge pull request 'v1.0.42' (#54) from dev into master

Reviewed-on: #54

pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>com.imyeyu.timiserverapi</groupId>
 	<artifactId>TimiServerAPI</artifactId>
-	<version>1.0.46</version>
+	<version>1.0.42</version>
 	<packaging>jar</packaging>
 	<name>TimiServerAPI</name>
 	<description>imyeyu.com API</description>

src/main/java/com/imyeyu/api/modules/common/entity/Article.java

@@ -34,8 +34,6 @@ public class Article extends UUIDEntity implements SettingSupport {
 		/// GAO 门店日记
 		GAO_STORE_DIARY,
 
-		GAO_HELP,
-
 		GAO_SYSTEM,
 
 		/// 反馈

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

@@ -16,9 +16,6 @@ public interface GaoOrderPaymentService {
 	/// 登记收款
 	GaoFundRecord receive(GaoOrderPaymentReceiveRequest request);
 
-	/// 登记已收款并直接核销
-	GaoFundRecord receiveAndVerify(GaoOrderPaymentReceiveRequest request);
-
 	/// 核销收款
 	GaoFundRecord verify(String fundRecordId);
 

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

@@ -1,17 +0,0 @@
-package com.imyeyu.api.modules.gao.service;
-
-import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
-import com.imyeyu.api.modules.gao.vo.GaoOrderStraightThroughRequest;
-
-/// GAO 订单创建直通服务
-///
-/// @author Codex
-/// @since 2026-09-13
-public interface GaoOrderStraightThroughService {
-
-	/// 在订单创建事务内完成可选的全额收款和全部履约
-	///
-	/// @param order 销售订单
-	/// @param straightThrough 直通请求，空为不直通
-	void complete(GaoSalesOrder order, GaoOrderStraightThroughRequest straightThrough);
-}

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

@@ -33,14 +33,6 @@ public interface GaoProductSkuService extends BaseService<GaoProductSku, String>
 	/// 查询并校验可销售 SKU 单位
 	GaoProductSkuUnitSelection getSellableSkuUnit(String storeId, String skuId, String skuUnitId);
 
-	/// 查询并校验可用于历史订单履约的 SKU 单位
-	///
-	/// @param storeId 门店 ID
-	/// @param skuId SKU ID
-	/// @param skuUnitId SKU 单位 ID
-	/// @return SKU 单位选择结果
-	GaoProductSkuUnitSelection getFulfillableSkuUnit(String storeId, String skuId, String skuUnitId);
-
 	/// 查询并校验 SKU 单位
 	GaoProductSkuUnitSelection getSkuUnit(String storeId, String skuId, String skuUnitId, boolean purchase);
 

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

@@ -46,9 +46,6 @@ public interface GaoProductStockService {
 	/// 为履约预占库存
 	boolean hasSufficientForFulfillment(String storeId, List<GaoStockChangeItem> items);
 
-	/// 获取履约库存缺口提示，无缺口时返回 null
-	String getFulfillmentStockShortageMessage(String storeId, List<GaoStockChangeItem> items);
-
 	/// 为履约预占库存
 	List<GaoProductStock> reserveForFulfillment(String storeId, String bizId, List<GaoStockChangeItem> items, String requestNo, String operatorUserId);
 

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

@@ -13,7 +13,6 @@ import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
 import com.imyeyu.api.modules.gao.entity.GaoSalesOrderItem;
 import com.imyeyu.api.modules.gao.mapper.GaoCustomerPackageMapper;
 import com.imyeyu.api.modules.gao.service.GaoSalesOrderService;
-import com.imyeyu.api.modules.gao.service.GaoOrderStraightThroughService;
 import com.imyeyu.api.modules.gao.service.GaoCustomerService;
 import com.imyeyu.api.modules.gao.service.GaoCustomerPackageService;
 import com.imyeyu.api.modules.gao.service.GaoPackageConfigService;
@@ -68,7 +67,6 @@ public class GaoCustomerPackageServiceImplement extends AbstractEntityService<Ga
 	private final GaoProductSkuService skuService;
 	private final GaoCustomerService customerService;
 	private final GaoSalesOrderService salesOrderService;
-	private final GaoOrderStraightThroughService straightThroughService;
 	private final GaoStoreScopeService storeScopeService;
 	private final AttachmentService attachmentService;
 	private final UserLoginService userLoginService;
@@ -170,7 +168,6 @@ public class GaoCustomerPackageServiceImplement extends AbstractEntityService<Ga
 		if (existingOrder != null) {
 			GaoCustomerPackage existingPackage = getBySalesOrderId(existingOrder.getId());
 			verifyPurchaseIdempotency(existingOrder, existingPackage, request);
-			straightThroughService.complete(salesOrderService.detail(existingOrder.getId()), request.getStraightThrough());
 			return existingPackage;
 		}
 		Long purchasedAt = TimiJava.defaultIfNull(request.getPurchasedAt(), Time.now());
@@ -208,8 +205,6 @@ public class GaoCustomerPackageServiceImplement extends AbstractEntityService<Ga
 		result.setStandardAmountSnapshot(config.getStandardAmount());
 		result.setRemark(request.getRemark());
 		super.create(result);
-		straightThroughService.complete(salesOrder, request.getStraightThrough());
-		salesOrder = salesOrderService.detail(salesOrder.getId());
 		result.setSalesOrder(salesOrder);
 		result.setItemList(salesOrder.getItemList());
 		result.setStatus(salesOrder.getStatus());

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

@@ -207,8 +207,7 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
 		List<GaoStockChangeItem> stockItems = buildStockItems(order.getStoreId(), sourceList);
 		applySkuSpecSnapshots(stockItems, fulfillmentItemList);
 		TimiException.requiredTrue(!stockItems.isEmpty(), "履约单没有需要占用的实物库存");
-		String stockShortageMessage = productStockService.getFulfillmentStockShortageMessage(order.getStoreId(), stockItems);
+		TimiException.requiredTrue(productStockService.hasSufficientForFulfillment(order.getStoreId(), stockItems), "库存仍然不足，不能准备履约");
-		TimiException.requiredTrue(stockShortageMessage == null, stockShortageMessage);
 		String operatorUserId = userLoginService.getRequireLoginUserId();
 		productStockService.reserveForFulfillment(order.getStoreId(), fulfillment.getId(), stockItems,
 			stockRequestNo(fulfillment, "RESERVE"), operatorUserId);
@@ -451,32 +450,12 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
 			GaoSalesOrderItem.ItemType expectedItemType = order.getOrderType() == GaoSalesOrder.OrderType.PACKAGE
 				? GaoSalesOrderItem.ItemType.PACKAGE_ENTITLEMENT : GaoSalesOrderItem.ItemType.DIRECT_PRODUCT;
 			TimiException.requiredTrue(source.getItemType() == expectedItemType, "订单项类型与订单类型不匹配");
-			if (requestItem.getSkuUnitId().equals(source.getSkuUnitId())) {
+			GaoProductSkuUnitSelection selection = skuService.getSellableSkuUnit(order.getStoreId(), source.getSkuId(), requestItem.getSkuUnitId());
-				result.add(toSourceByOrderSnapshot(order, source, requestItem.getQuantity(), checkAvailable));
-				continue;
-			}
-			GaoProductSkuUnitSelection selection = skuService.getFulfillableSkuUnit(order.getStoreId(), source.getSkuId(), requestItem.getSkuUnitId());
 			result.add(toSource(order, source, selection.getProduct(), selection.getSku(), selection.getUnit(), requestItem.getQuantity(), checkAvailable));
 		}
 		return result;
 	}
 
-	private SourceEntry toSourceByOrderSnapshot(GaoSalesOrder order, GaoSalesOrderItem source, BigDecimal quantity, boolean checkAvailable) {
-		GaoProductSku sku = skuService.get(source.getSkuId());
-		TimiException.required(sku, "履约来源 SKU 不存在");
-		GaoProduct product = productService.get(sku.getProductId());
-		TimiException.required(product, "履约来源产品不存在");
-		TimiException.requiredTrue(order.getStoreId().equals(product.getStoreId()), "履约来源产品不属于当前门店");
-		quantity = requiredPositiveQuantity(quantity, "履约数量");
-		if (!Boolean.TRUE.equals(sku.getAllowDecimalQuantity())) {
-			TimiException.requiredTrue(quantity.stripTrailingZeros().scale() <= 0, "该产品不允许小数数量");
-		}
-		BigDecimal baseQuantityPerUnit = requiredBaseQuantityPerUnit(source.getBaseQuantityPerUnitSnapshot());
-		BigDecimal baseQuantity = toBaseQuantity(quantity, baseQuantityPerUnit, "履约基础数量最多保留三位小数");
-		return buildSource(order, source, source.getSkuUnitId(), source.getUnitSnapshot(), baseQuantityPerUnit, quantity,
-			baseQuantity, product, sku, checkAvailable);
-	}
-
 	private List<SourceEntry> loadPersistedSources(GaoSalesOrder order, List<GaoOrderFulfillmentItem> itemList) {
 		TimiException.requiredTrue(itemList != null && !itemList.isEmpty(), "履约单没有明细");
 		List<GaoOrderFulfillmentItem> sortedItemList = new ArrayList<>(itemList);

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

@@ -49,17 +49,10 @@ public class GaoOrderPaymentServiceImplement implements GaoOrderPaymentService {
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoFundRecord receive(GaoOrderPaymentReceiveRequest request) {
-		return receiveInternal(request, false);
+		return receiveInternal(request);
 	}
 
-	@OperationAudit(AuditOperation.GAO_SALES_ORDER_PAYMENT_RECEIVE)
+	private GaoFundRecord receiveInternal(GaoOrderPaymentReceiveRequest request) {
-	@Transactional(TimiServerDBConfig.ROLLBACKER)
-	@Override
-	public GaoFundRecord receiveAndVerify(GaoOrderPaymentReceiveRequest request) {
-		return receiveInternal(request, true);
-	}
-
-	private GaoFundRecord receiveInternal(GaoOrderPaymentReceiveRequest request, boolean verified) {
 		TimiException.required(request, "not found order payment request");
 		TimiException.required(request.getSalesOrderId(), "not found salesOrderId");
 		TimiException.required(request.getAmount(), "收款金额不能为空");
@@ -69,7 +62,7 @@ public class GaoOrderPaymentServiceImplement implements GaoOrderPaymentService {
 		GaoFundRecord existing = fundRecordService.getByRequestNo(order.getStoreId(), requestNo);
 		if (existing != null) {
 			verifySameReceive(existing, order, request);
-			return verified && existing.getStatus() == GaoFundRecord.Status.PENDING ? verify(existing.getId()) : existing;
+			return existing;
 		}
 		TimiException.requiredTrue(order.getStatus() != GaoSalesOrder.Status.CANCELLED, "已取消订单不能收款");
 		TimiException.requiredTrue(order.getRefundStatus() != GaoSalesOrder.RefundStatus.REFUNDED, "已完成退款订单不能收款");
@@ -78,27 +71,9 @@ public class GaoOrderPaymentServiceImplement implements GaoOrderPaymentService {
 		TimiException.requiredTrue(pending + paid + request.getAmount() <= safe(order.getSaleAmount()), "累计收款不能超过成交价");
 		TimiException.requiredTrue(hasPhoto(request.getAttachmentList()), "收款必须上传照片");
 		GaoFundRecord record = newRecord(order, GaoFundRecord.OperationType.RECEIVE, requestNo, request.getAmount(), request.getOccurredAt(), request.getRemark());
-		record.setStatus(verified ? GaoFundRecord.Status.VERIFIED : GaoFundRecord.Status.PENDING);
+		record.setStatus(GaoFundRecord.Status.PENDING);
-		String verifierUserId = verified ? userLoginService.getRequireLoginUserId() : null;
-		Long verifiedAt = verified ? Time.now() : null;
-		if (verified) {
-			record.setVerifierUserId(verifierUserId);
-			record.setVerifiedAt(verifiedAt);
-		}
 		fundRecordService.createByOrderPayment(record);
-		if (!verified) {
 		order.setPendingPaidAmount(pending + request.getAmount());
-		} else {
-			Long paidAtBefore = order.getPaidAt();
-			order.setPaidAmount(paid + request.getAmount());
-			orderService.recomputePaymentStatus(order);
-			orderService.updatePayment(order);
-			if (paidAtBefore == null && order.getPaidAt() != null) {
-				pointTriggerService.onSalesOrderPaid(order);
-			}
-			attachmentService.updateByBizId(Attachment.BizType.GAO_FUND_RECORD, record.getId(), request.getAttachmentList());
-			return record;
-		}
 		orderService.recomputePaymentStatus(order);
 		orderService.updatePayment(order);
 		attachmentService.updateByBizId(Attachment.BizType.GAO_FUND_RECORD, record.getId(), request.getAttachmentList());

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

@@ -1,155 +0,0 @@
-package com.imyeyu.api.modules.gao.service.implement;
-
-import com.imyeyu.api.bean.ModuleCode;
-import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
-import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
-import com.imyeyu.api.modules.gao.entity.GaoFundRecord;
-import com.imyeyu.api.modules.gao.entity.GaoOrderFulfillment;
-import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
-import com.imyeyu.api.modules.gao.entity.GaoSalesOrderItem;
-import com.imyeyu.api.modules.gao.service.GaoOrderFulfillmentService;
-import com.imyeyu.api.modules.gao.service.GaoOrderPaymentService;
-import com.imyeyu.api.modules.gao.service.GaoOrderStraightThroughService;
-import com.imyeyu.api.modules.gao.vo.GaoOrderFulfillmentCreateRequest;
-import com.imyeyu.api.modules.gao.vo.GaoOrderFulfillmentActionRequest;
-import com.imyeyu.api.modules.gao.vo.GaoOrderFulfillmentItemRequest;
-import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentReceiveRequest;
-import com.imyeyu.api.modules.gao.vo.GaoOrderStraightThroughRequest;
-import com.imyeyu.api.modules.user.service.PermissionChecker;
-import com.imyeyu.java.TimiJava;
-import com.imyeyu.java.bean.timi.TimiException;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/// GAO 订单创建直通服务实现
-///
-/// @author Codex
-/// @since 2026-09-13
-@Service
-@RequiredArgsConstructor
-public class GaoOrderStraightThroughServiceImplement implements GaoOrderStraightThroughService {
-
-	private final GaoOrderPaymentService paymentService;
-	private final GaoOrderFulfillmentService fulfillmentService;
-	private final PermissionChecker permissionChecker;
-
-	@Override
-	@Transactional(TimiServerDBConfig.ROLLBACKER)
-	public void complete(GaoSalesOrder order, GaoOrderStraightThroughRequest straightThrough) {
-		if (straightThrough == null) {
-			return;
-		}
-		boolean paymentVerified = Boolean.TRUE.equals(straightThrough.getPaymentVerified());
-		boolean receiveFullPayment = Boolean.TRUE.equals(straightThrough.getReceiveFullPayment());
-		boolean fulfillAll = Boolean.TRUE.equals(straightThrough.getFulfillAll());
-		Long paymentAmount = paymentVerified ? straightThrough.getPaymentAmount() : order.getSaleAmount();
-		if (!paymentVerified && !receiveFullPayment && !fulfillAll) {
-			return;
-		}
-		TimiException.required(order, "not found sales order");
-		TimiException.required(order.getId(), "not found salesOrderId");
-		TimiException.requiredTrue(!(paymentVerified && receiveFullPayment), "已核销收款和已全额收款和核销不能同时启用");
-		if (paymentVerified) {
-			TimiException.required(paymentAmount, "已核销收款金额不能为空");
-			TimiException.requiredTrue(0 < paymentAmount && paymentAmount <= safe(order.getSaleAmount()), "已核销收款金额不能超过订单金额");
-		}
-		TimiException.requiredTrue(!fulfillAll || receiveFullPayment || order.getSaleAmount() == 0
-			|| (paymentVerified && paymentAmount.equals(order.getSaleAmount())),
-			"全部履约直通必须同时完成收款核销");
-		checkPermissions(order.getOrderType(), paymentVerified || receiveFullPayment, fulfillAll);
-		if (receiveFullPayment) {
-			settle(order, straightThrough);
-		} else if (paymentVerified) {
-			verifyReceivedPayment(order, straightThrough, paymentAmount);
-		}
-		if (fulfillAll) {
-			fulfill(order, straightThrough);
-		}
-	}
-
-	private void checkPermissions(GaoSalesOrder.OrderType orderType, boolean paymentCompleted, boolean fulfillAll) {
-		List<String> permissionCodeList = new ArrayList<>();
-		permissionCodeList.add(orderType == GaoSalesOrder.OrderType.PACKAGE
-			? GaoPermissionCode.CUSTOMER_PACKAGE_CREATE.getValue() : GaoPermissionCode.SALES_ORDER_CREATE.getValue());
-		if (paymentCompleted) {
-			permissionCodeList.add(GaoPermissionCode.FUND_RECEIVE_CREATE.getValue());
-			permissionCodeList.add(GaoPermissionCode.FUND_RECEIVE_VERIFY.getValue());
-		}
-		if (fulfillAll) {
-			permissionCodeList.add(GaoPermissionCode.ORDER_FULFILLMENT_CREATE.getValue());
-			permissionCodeList.add(GaoPermissionCode.ORDER_FULFILLMENT_VERIFY.getValue());
-		}
-		permissionChecker.checkAll(ModuleCode.GAO, permissionCodeList.toArray(String[]::new));
-	}
-
-	private void settle(GaoSalesOrder order, GaoOrderStraightThroughRequest straightThrough) {
-		if (order.getSaleAmount() == null || order.getSaleAmount() == 0) {
-			return;
-		}
-		GaoOrderPaymentReceiveRequest paymentRequest = new GaoOrderPaymentReceiveRequest();
-		paymentRequest.setSalesOrderId(order.getId());
-		paymentRequest.setRequestNo("ORDER-%s-FULL-PAY".formatted(order.getId()));
-		paymentRequest.setAmount(order.getSaleAmount());
-		paymentRequest.setOccurredAt(TimiJava.defaultIfNull(straightThrough.getPaymentOccurredAt(), order.getPurchasedAt()));
-		paymentRequest.setAttachmentList(straightThrough.getPaymentAttachmentList());
-		paymentRequest.setRemark(TimiJava.defaultIfEmpty(straightThrough.getPaymentRemark(), "随订单创建直接全额收款"));
-		GaoFundRecord record = paymentService.receive(paymentRequest);
-		if (record.getStatus() == GaoFundRecord.Status.PENDING) {
-			paymentService.verify(record.getId());
-			return;
-		}
-		TimiException.requiredTrue(record.getStatus() == GaoFundRecord.Status.VERIFIED, "直通收款记录不是已核销状态");
-	}
-
-	private void verifyReceivedPayment(GaoSalesOrder order, GaoOrderStraightThroughRequest straightThrough, Long paymentAmount) {
-		GaoOrderPaymentReceiveRequest paymentRequest = new GaoOrderPaymentReceiveRequest();
-		paymentRequest.setSalesOrderId(order.getId());
-		paymentRequest.setRequestNo("ORDER-%s-VERIFIED-PAY".formatted(order.getId()));
-		paymentRequest.setAmount(paymentAmount);
-		paymentRequest.setOccurredAt(TimiJava.defaultIfNull(straightThrough.getPaymentOccurredAt(), order.getPurchasedAt()));
-		paymentRequest.setAttachmentList(straightThrough.getPaymentAttachmentList());
-		paymentRequest.setRemark(TimiJava.defaultIfEmpty(straightThrough.getPaymentRemark(), "随订单创建直接核销已有收款"));
-		GaoFundRecord record = paymentService.receiveAndVerify(paymentRequest);
-		TimiException.requiredTrue(record.getStatus() == GaoFundRecord.Status.VERIFIED, "直通收款记录不是已核销状态");
-	}
-
-	private void fulfill(GaoSalesOrder order, GaoOrderStraightThroughRequest straightThrough) {
-		List<GaoSalesOrderItem> orderItemList = order.getItemList();
-		TimiException.requiredTrue(orderItemList != null && !orderItemList.isEmpty(), "销售订单没有可履约明细");
-		List<GaoOrderFulfillmentItemRequest> itemList = orderItemList.stream().map(item -> {
-			GaoOrderFulfillmentItemRequest result = new GaoOrderFulfillmentItemRequest();
-			result.setSourceOrderItemId(item.getId());
-			result.setSkuUnitId(item.getSkuUnitId());
-			result.setQuantity(item.getQuantity());
-			return result;
-		}).toList();
-		GaoOrderFulfillmentCreateRequest fulfillmentRequest = new GaoOrderFulfillmentCreateRequest();
-		fulfillmentRequest.setSalesOrderId(order.getId());
-		fulfillmentRequest.setRequestNo("ORDER-%s-FULL-FULFILL".formatted(order.getId()));
-		fulfillmentRequest.setDeliveredAt(TimiJava.defaultIfNull(straightThrough.getDeliveredAt(), order.getPurchasedAt()));
-		fulfillmentRequest.setItemList(itemList);
-		fulfillmentRequest.setAttachmentList(straightThrough.getFulfillmentAttachmentList());
-		fulfillmentRequest.setRemark(TimiJava.defaultIfEmpty(straightThrough.getFulfillmentRemark(), "随订单创建直接全部履约"));
-		GaoOrderFulfillment fulfillment = fulfillmentService.create(fulfillmentRequest);
-		if (fulfillment.getStatus() == GaoOrderFulfillment.Status.PENDING) {
-			fulfillmentService.verify(actionRequest(fulfillment.getId()));
-			return;
-		}
-		TimiException.requiredTrue(fulfillment.getStatus() == GaoOrderFulfillment.Status.VERIFIED,
-			fulfillment.getStatus() == GaoOrderFulfillment.Status.WAITING_STOCK ? "库存不足，不能全部履约直通" : "直通履约单不是已核销状态");
-	}
-
-	private GaoOrderFulfillmentActionRequest actionRequest(String fulfillmentId) {
-		GaoOrderFulfillmentActionRequest request = new GaoOrderFulfillmentActionRequest();
-		request.setFulfillmentId(fulfillmentId);
-		return request;
-	}
-
-	private long safe(Long value) {
-		return value == null ? 0L : value;
-	}
-}

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

@@ -109,22 +109,6 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
 		return getSkuUnit(storeId, skuId, skuUnitId, false);
 	}
 
-	@Override
-	public GaoProductSkuUnitSelection getFulfillableSkuUnit(String storeId, String skuId, String skuUnitId) {
-		TimiException.required(storeId, "门店 ID 不能为空");
-		TimiException.required(skuId, "SKU ID 不能为空");
-		TimiException.required(skuUnitId, "SKU 单位 ID 不能为空");
-		GaoProductSku sku = mapper.selectForUpdate(skuId);
-		TimiException.required(sku, "SKU 不存在");
-		TimiException.requiredTrue(storeId.equals(sku.getStoreId()), "SKU 不属于当前门店");
-		GaoProduct product = productServiceProvider.getObject().get(sku.getProductId());
-		TimiException.required(product, "产品不存在");
-		GaoProductSkuUnit unit = unitMapper.selectForUpdate(skuUnitId);
-		TimiException.required(unit, "SKU 单位不存在");
-		TimiException.requiredTrue(skuId.equals(unit.getSkuId()), "SKU 单位不属于当前 SKU");
-		return new GaoProductSkuUnitSelection(product, sku, unit);
-	}
-
 	@Override
 	public GaoProductSkuUnitSelection getSkuUnit(String storeId, String skuId, String skuUnitId, boolean purchase) {
 		TimiException.required(storeId, "not found storeId");
@@ -370,8 +354,11 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
 				TimiException.requiredTrue(1 == unitMapper.updateUnit(unit), "SKU 单位更新失败");
 			}
 		}
-		TimiException.requiredTrue(existingUnitList.stream().allMatch(existing -> retainedIdSet.contains(existing.getId())),
+		for (GaoProductSkuUnit existing : existingUnitList) {
-			"已保存的 SKU 单位不能删除，请关闭允许销售和允许采购");
+			if (!retainedIdSet.contains(existing.getId())) {
+				unitMapper.delete(existing.getId());
+			}
+		}
 	}
 
 	private void saveSpecValues(String skuId, List<String> specValueIdList) {

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

@@ -156,30 +156,19 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
 	@Override
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	public boolean hasSufficientForFulfillment(String storeId, List<GaoStockChangeItem> items) {
-		return getFulfillmentStockShortageMessage(storeId, items) == null;
-	}
-
-	@Override
-	@Transactional(TimiServerDBConfig.ROLLBACKER)
-	public String getFulfillmentStockShortageMessage(String storeId, List<GaoStockChangeItem> items) {
 		TimiException.required(storeId, "not found storeId");
 		if (items == null || items.isEmpty()) {
-			return null;
+			return true;
 		}
 		List<GaoStockChangeItem> sortedItems = new ArrayList<>(items);
 		sortedItems.sort(Comparator.comparing(GaoStockChangeItem::getSkuId));
-		List<String> shortageList = new ArrayList<>();
 		for (GaoStockChangeItem item : sortedItems) {
 			GaoProductStock stock = stockMapper.selectForUpdate(storeId, item.getSkuId());
-			BigDecimal availableQuantity = stock == null ? ZERO : decimal(stock.getOnHandQuantity()).subtract(decimal(stock.getReservedQuantity()));
+			if (stock == null || decimal(stock.getOnHandQuantity()).subtract(decimal(stock.getReservedQuantity())).compareTo(item.getBaseQuantity()) < 0) {
-			BigDecimal shortageQuantity = item.getBaseQuantity().subtract(availableQuantity);
+				return false;
-			if (0 < shortageQuantity.signum()) {
-				shortageList.add("%s（%s）可用 %s %s，缺少 %s %s".formatted(
-					item.getProductNameSnapshot(), item.getSkuNameSnapshot(), availableQuantity.toPlainString(), item.getUnitSnapshot(),
-					shortageQuantity.toPlainString(), item.getUnitSnapshot()));
 			}
 		}
-		return shortageList.isEmpty() ? null : "库存不足：" + String.join("；", shortageList);
+		return true;
 	}
 
 	@Override

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

@@ -21,7 +21,6 @@ import com.imyeyu.api.modules.gao.service.GaoCustomerService;
 import com.imyeyu.api.modules.gao.service.GaoEventRecordService;
 import com.imyeyu.api.modules.gao.service.GaoFundRecordService;
 import com.imyeyu.api.modules.gao.service.GaoOrderFulfillmentService;
-import com.imyeyu.api.modules.gao.service.GaoOrderStraightThroughService;
 import com.imyeyu.api.modules.gao.service.GaoPointTriggerService;
 import com.imyeyu.api.modules.gao.service.GaoProductService;
 import com.imyeyu.api.modules.gao.service.GaoProductSkuService;
@@ -81,7 +80,6 @@ public class GaoSalesOrderServiceImplement extends AbstractEntityService<GaoSale
 	private final GaoSalesOrderItemMapper itemMapper;
 	private final GaoFundRecordService fundRecordService;
 	private final ObjectProvider<GaoOrderFulfillmentService> fulfillmentServiceProvider;
-	private final ObjectProvider<GaoOrderStraightThroughService> straightThroughServiceProvider;
 	private final GaoCustomerService customerService;
 	private final GaoProductService productService;
 	private final GaoProductSkuService skuService;
@@ -145,9 +143,7 @@ public class GaoSalesOrderServiceImplement extends AbstractEntityService<GaoSale
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoSalesOrder createDirectProductOrder(GaoDirectProductOrderCreateRequest request) {
-		GaoSalesOrder order = createDirectInternal(request);
+		return createDirectInternal(request);
-		straightThroughServiceProvider.getObject().complete(order, request.getStraightThrough());
-		return detail(order.getId());
 	}
 
 	@OperationAudit(AuditOperation.GAO_SALES_ORDER_UPDATE)

src/main/java/com/imyeyu/api/modules/gao/vo/GaoCustomerPackagePurchaseRequest.java

@@ -33,9 +33,6 @@ public class GaoCustomerPackagePurchaseRequest {
 	/// 购买照片
 	private List<Attachment> attachmentList;
 
-	/// 创建订单后的直通处理
-	private GaoOrderStraightThroughRequest straightThrough;
-
 	/// 备注
 	private String remark;
 }

src/main/java/com/imyeyu/api/modules/gao/vo/GaoDirectProductOrderCreateRequest.java

@@ -30,9 +30,6 @@ public class GaoDirectProductOrderCreateRequest {
 	/// 购买照片
 	private List<Attachment> attachmentList;
 
-	/// 创建订单后的直通处理
-	private GaoOrderStraightThroughRequest straightThrough;
-
 	/// 备注
 	private String remark;
 }

src/main/java/com/imyeyu/api/modules/gao/vo/GaoOrderStraightThroughRequest.java

@@ -1,44 +0,0 @@
-package com.imyeyu.api.modules.gao.vo;
-
-import com.imyeyu.api.modules.common.entity.Attachment;
-import lombok.Data;
-
-import java.util.List;
-
-/// GAO 订单创建直通请求
-///
-/// @author Codex
-/// @since 2026-09-13
-@Data
-public class GaoOrderStraightThroughRequest {
-
-	/// true 为已有收款并直接核销
-	private Boolean paymentVerified;
-
-	/// 已核销收款金额，单位分
-	private Long paymentAmount;
-
-	/// true 为直接全额收款并核销
-	private Boolean receiveFullPayment;
-
-	/// 实际收款时间，空为订单下单时间
-	private Long paymentOccurredAt;
-
-	/// 收款凭证照片
-	private List<Attachment> paymentAttachmentList;
-
-	/// 收款备注
-	private String paymentRemark;
-
-	/// true 为直接全部履约并核销
-	private Boolean fulfillAll;
-
-	/// 实际履约时间，空为订单下单时间
-	private Long deliveredAt;
-
-	/// 履约凭证照片
-	private List<Attachment> fulfillmentAttachmentList;
-
-	/// 履约备注
-	private String fulfillmentRemark;
-}

src/main/resources/mapper/timi-server/gao/GaoPointAccountMapper.xml

@@ -53,7 +53,7 @@
 		INNER JOIN `gao_customer` `c` ON `c`.`id` = `a`.`customer_id` AND `c`.`store_id` = `a`.`store_id`
 		WHERE
 			<include refid="queryWhere"/>
-		ORDER BY `a`.`total_earned` DESC, `a`.`created_at` DESC, `a`.`id` DESC
+		ORDER BY `a`.`created_at` DESC, `a`.`id` DESC
 		LIMIT #{offset}, #{limit}
 	</select>