internal/service/user/address_share.go

@@ -112,7 +112,27 @@ func (s *service) SubmitAddressShare(ctx context.Context, shareToken string, nam
 
 	s.logger.Info("SubmitAddressShare: Processing", zap.Int64("invID", claims.InventoryID), zap.Int64("owner", claims.OwnerUserID))
 
-	// 1. 确定资产最终归属地 (实名转赠逻辑)
+	// 1. 基本安全校验
+	cnt, err := s.readDB.ShippingRecords.WithContext(ctx).Where(
+		s.readDB.ShippingRecords.InventoryID.Eq(claims.InventoryID),
+		s.readDB.ShippingRecords.Status.Neq(5), // 排除已取消
+	).Count()
+	if err == nil && cnt > 0 {
+		s.logger.Warn("SubmitAddressShare: Already processed", zap.Int64("invID", claims.InventoryID))
+		return 0, fmt.Errorf("already_processed")
+	}
+
+	inv, err := s.readDB.UserInventory.WithContext(ctx).Where(s.readDB.UserInventory.ID.Eq(claims.InventoryID)).First()
+	if err != nil {
+		s.logger.Error("SubmitAddressShare: Inventory not found", zap.Int64("invID", claims.InventoryID), zap.Error(err))
+		return 0, err
+	}
+	if inv.Status != 1 {
+		s.logger.Warn("SubmitAddressShare: Inventory unavailable", zap.Int64("invID", claims.InventoryID), zap.Int32("status", inv.Status))
+		return 0, fmt.Errorf("inventory_unavailable")
+	}
+
+	// 2. 确定资产最终归属地 (实名转赠逻辑)
 	targetUserID := claims.OwnerUserID
 	isTransfer := false
 	if submittedByUserID != nil && *submittedByUserID > 0 && *submittedByUserID != claims.OwnerUserID {
@@ -122,33 +142,7 @@ func (s *service) SubmitAddressShare(ctx context.Context, shareToken string, nam
 
 	var addrID int64
 	err = s.repo.GetDbW().Transaction(func(tx *gorm.DB) error {
-		// a. 锁定资产行（SELECT FOR UPDATE 防止并发转赠）
+		// a. 创建收货地址 (归属于 targetUserID)
-		var inv model.UserInventory
-		lockResult := tx.Raw("SELECT * FROM user_inventory WHERE id = ? FOR UPDATE", claims.InventoryID).Scan(&inv)
-		if lockResult.Error != nil {
-			s.logger.Error("SubmitAddressShare: Lock inventory failed", zap.Int64("invID", claims.InventoryID), zap.Error(lockResult.Error))
-			return lockResult.Error
-		}
-		if inv.ID == 0 {
-			s.logger.Warn("SubmitAddressShare: Inventory not found", zap.Int64("invID", claims.InventoryID))
-			return fmt.Errorf("inventory_unavailable")
-		}
-		if inv.Status != 1 {
-			s.logger.Warn("SubmitAddressShare: Inventory unavailable", zap.Int64("invID", claims.InventoryID), zap.Int32("status", inv.Status))
-			return fmt.Errorf("inventory_unavailable")
-		}
-
-		// b. 在事务内检查发货记录（使用写库，避免主从延迟）
-		var shipCnt int64
-		if err := tx.Raw("SELECT COUNT(*) FROM shipping_records WHERE inventory_id = ? AND status != 5", claims.InventoryID).Scan(&shipCnt).Error; err != nil {
-			return err
-		}
-		if shipCnt > 0 {
-			s.logger.Warn("SubmitAddressShare: Already processed", zap.Int64("invID", claims.InventoryID))
-			return fmt.Errorf("already_processed")
-		}
-
-		// c. 创建收货地址 (归属于 targetUserID)
 		arow := &model.UserAddresses{
 			UserID:    targetUserID,
 			Name:      name,
@@ -170,7 +164,7 @@ func (s *service) SubmitAddressShare(ctx context.Context, shareToken string, nam
 		}
 		addrID = arow.ID
 
-		// d. 资产状态更新及所有权转移（检查 RowsAffected 防止并发写入）
+		// b. 资产状态更新及所有权转移
 		if isTransfer {
 			// 记录转赠流水
 			transferLog := &model.UserInventoryTransfers{
@@ -184,36 +178,28 @@ func (s *service) SubmitAddressShare(ctx context.Context, shareToken string, nam
 			}
 
 			// 更新资产所属人
-			result := tx.Table("user_inventory").Where("id = ? AND user_id = ? AND status = 1", claims.InventoryID, claims.OwnerUserID).
+			if err := tx.Table("user_inventory").Where("id = ? AND user_id = ? AND status = 1", claims.InventoryID, claims.OwnerUserID).
 				Updates(map[string]interface{}{
 					"user_id":    targetUserID,
 					"status":     3,
 					"updated_at": time.Now(),
 					"remark":     fmt.Sprintf("transferred_from_%d|shipping_requested", claims.OwnerUserID),
-				})
+				}).Error; err != nil {
-			if result.Error != nil {
+				return err
-				return result.Error
-			}
-			if result.RowsAffected == 0 {
-				return fmt.Errorf("inventory_unavailable")
 			}
 		} else {
 			// 仅更新状态 (原主发货)
-			result := tx.Table("user_inventory").Where("id = ? AND user_id = ? AND status = 1", claims.InventoryID, claims.OwnerUserID).
+			if err := tx.Table("user_inventory").Where("id = ? AND user_id = ? AND status = 1", claims.InventoryID, claims.OwnerUserID).
 				Updates(map[string]interface{}{
 					"status":     3,
 					"updated_at": time.Now(),
 					"remark":     "shipping_requested_via_share",
-				})
+				}).Error; err != nil {
-			if result.Error != nil {
+				return err
-				return result.Error
-			}
-			if result.RowsAffected == 0 {
-				return fmt.Errorf("inventory_unavailable")
 			}
 		}
 
-		// e. 创建发货记录 (归属于 targetUserID)
+		// c. 创建发货记录 (归属于 targetUserID)
 		// 使用资产价值快照，确保价格与分解时一致
 		price := inv.ValueCents
 		if price <= 0 && inv.ProductID > 0 {
@@ -568,7 +554,6 @@ func (s *service) RedeemInventoryToPoints(ctx context.Context, userID int64, inv
 	if err != nil {
 		return 0, err
 	}
-
 	valueCents := inv.ValueCents
 	valueSource := inv.ValueSource
 	valueSnapshotAt := inv.ValueSnapshotAt